This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Merge branch 'master' into net4.7.1

  • Loading branch information...
kf6kjg committed Aug 14, 2018
2 parents 0c6f918 + cbd4697 commit d9dd160f3ad5bf4410e4278e854a9c41e07094e2
View
@@ -69,3 +69,13 @@ artifacts:
- path: halcyon
name: Halcyon-$(APPVEYOR_BUILD_VERSION)-$(APPVEYOR_REPO_BRANCH)-$(EDITION)
type: zip
deploy:
provider: GitHub
auth_token:
secure: "CfI4VUu86RwI9MC8YoMfj9PJRiyoVkwD8AAyiUgKXpPU32Zw"
artifact: Halcyon-$(APPVEYOR_BUILD_VERSION)-$(APPVEYOR_REPO_BRANCH)-$(EDITION)
draft: true
prerelease: false
on:
APPVEYOR_REPO_TAG: true
View
@@ -253,3 +253,5 @@ bin4
bin/blacklist.old
bin/blacklist.txt
*.pid
OpenSim/Framework/Servers/VersionInfo\.cs
@@ -12,7 +12,6 @@
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<OutputPath>../../../bin/</OutputPath>
<OutputType>Library</OutputType>
@@ -22,6 +21,7 @@
<StartArguments></StartArguments>
<FileUpgradeFlags>
</FileUpgradeFlags>
<PreBuildEventUseInBuild>true</PreBuildEventUseInBuild>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -42,6 +42,7 @@
<NoStdLib>False</NoStdLib>
<NoWarn></NoWarn>
<PlatformTarget>x64</PlatformTarget>
<PreBuildEventUseInBuild>true</PreBuildEventUseInBuild>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -62,41 +63,46 @@
<NoStdLib>False</NoStdLib>
<NoWarn></NoWarn>
<PlatformTarget>x64</PlatformTarget>
<PreBuildEventUseInBuild>true</PreBuildEventUseInBuild>
</PropertyGroup>
<ItemGroup>
<Reference Include="LibreMetaverse.StructuredData" >
<Reference Include="LibreMetaverse.StructuredData">
<Name>LibreMetaverse.StructuredData</Name>
<HintPath>..\..\..\bin\LibreMetaverse.StructuredData.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="LibreMetaverse.Types" >
<Reference Include="LibreMetaverse.Types">
<Name>LibreMetaverse.Types</Name>
<HintPath>..\..\..\bin\LibreMetaverse.Types.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="log4net" >
<Reference Include="log4net">
<Name>log4net</Name>
<HintPath>..\..\..\bin\log4net.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Nini" >
<Reference Include="Nini">
<Name>Nini</Name>
<HintPath>..\..\..\bin\Nini.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" >
<Reference Include="System">
<Name>System</Name>
<Private>False</Private>
</Reference>
<Reference Include="System.Xml" >
<Reference Include="System.Xml">
<Name>System.Xml</Name>
<Private>False</Private>
</Reference>
<Reference Include="XmlRpcCS" >
<Reference Include="XmlRpcCS">
<Name>XmlRpcCS</Name>
<HintPath>..\..\..\bin\XmlRpcCS.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Mono.TextTemplating">
<!-- If this gets updated, be sure to update the PreBuildEvent. -->
<HintPath>..\..\..\packages\Mono.TextTemplating.1.3.1\lib\net45\Mono.TextTemplating.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Data\OpenSim.Data.csproj">
@@ -144,9 +150,15 @@
<SubType>Code</SubType>
</Compile>
</ItemGroup>
<ItemGroup>
<None Include="VersionInfo.tt" />
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<!-- MS's T4 template engine requires copying around some DLLS. Meh, I'll just import the Mono based unit - I know it works on Linux. -->
<PreBuildEvent>
$(SolutionDir)packages\Mono.TextTemplating.1.3.1\tools\TextTransform.exe -o $(ProjectDir)VersionInfo.cs $(ProjectDir)VersionInfo.tt
</PreBuildEvent>
<PostBuildEvent>
</PostBuildEvent>
@@ -1,3 +1,9 @@
<#@ output extension=".cs" #>
<#@ template language="C#" #>
<#@ assembly name="System.Core" #>
<#@ import namespace="System.Linq" #>
<#@ import namespace="System.Text" #>
<#@ import namespace="System.Collections.Generic" #>
/*
* Copyright (c) InWorldz Halcyon Developers
* Copyright (c) Contributors, http://opensimulator.org/
@@ -25,12 +31,14 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
// THIS CS FILE IS AUTO GENERATED FROM A T4 TEMPLATE. MODIFY THE TEMPLATE, NOT THE CS FILE!
using System.Reflection;
// Version format is Major.Minor.Patch.Revision
// Using the "build" number, the 3rd value, as patch is a bit non-standard from MS's perspective. However this is what https://semver.org/ uses it as.
// Using a * for the last number means auto-fill with the # days since 2000. Good for us here as we've always historically used the revision field as a unique ID value. Originally it was the SVN revision number, but since the switch to git that went away.
[assembly: AssemblyVersion("0.9.40.*")]
// Using day since 2000 is good for us here as we've always historically used the revision field as a unique ID value. Originally it was the SVN revision number, but since the switch to git that went away.
[assembly: AssemblyVersion("0.9.41.<#= (int)DateTimeOffset.UtcNow.Subtract(new DateTimeOffset(2000, 1, 1, 0, 0, 0, TimeSpan.Zero)).TotalDays #>")]
// Do not provide AssemblyFileVersion and it will be kept in sync.
namespace OpenSim
@@ -62,6 +70,21 @@ private static string _Initialize()
return _revision;
}
/// <value>
/// This is the external interface version. It is separate from the externally-visible version info.
///
/// This version number should be increased by 1 every time a code change makes the previous revision incompatible
/// with the new revision. This will usually be due to interregion or grid facing interface changes.
///
/// Changes which are compatible with an older revision (e.g. older revisions experience degraded functionality
/// but not outright failure) do not need a version number increment.
///
/// Having this version number allows the grid service to reject connections from regions running a version
/// of the code that is too old.
///
/// </value>
public readonly static int MajorInterfaceVersion = 4;
public static string Revision
{
@@ -107,20 +130,5 @@ public static string Version
return _version + "." + Revision;
}
}
/// <value>
/// This is the external interface version. It is separate from the externally-visible version info.
///
/// This version number should be increased by 1 every time a code change makes the previous revision incompatible
/// with the new revision. This will usually be due to interregion or grid facing interface changes.
///
/// Changes which are compatible with an older revision (e.g. older revisions experience degraded functionality
/// but not outright failure) do not need a version number increment.
///
/// Having this version number allows the grid service to reject connections from regions running a version
/// of the code that is too old.
///
/// </value>
public readonly static int MajorInterfaceVersion = 4;
}
}
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Mono.TextTemplating" version="1.3.1" targetFramework="net45" />
</packages>
@@ -526,6 +526,8 @@ private bool LoadRegionSettings(string settingsPath, byte[] data)
currentRegionSettings.UseEstateSun = loadedRegionSettings.UseEstateSun;
currentRegionSettings.WaterHeight = loadedRegionSettings.WaterHeight;
currentRegionSettings.Save();
IEstateModule estateModule = m_scene.RequestModuleInterface<IEstateModule>();
estateModule.sendRegionHandshakeToAll();

0 comments on commit d9dd160

Please sign in to comment.