*Renamed GridCommsManager to CommunicationsOGS1 to match CommunicationsLocal -- its sandbox mode counterpart
parent
108d89f894
commit
d3363bbc28
|
@ -118,7 +118,7 @@ namespace OpenSim
|
|||
else
|
||||
{
|
||||
this.SetupRemoteGridServers();
|
||||
this.commsManager = new GridCommsManager(this.serversData);
|
||||
this.commsManager = new CommunicationsOGS1(this.serversData);
|
||||
}
|
||||
|
||||
startuptime = DateTime.Now;
|
||||
|
|
|
@ -5,10 +5,10 @@ using OpenSim.Framework.Types;
|
|||
using OpenSim.Framework.Communications;
|
||||
namespace OpenSim.Region.Communications.OGS1
|
||||
{
|
||||
public class GridCommsManager : CommunicationsManager
|
||||
public class CommunicationsOGS1 : CommunicationsManager
|
||||
{
|
||||
private OGS1GridServices gridInterComms = new OGS1GridServices();
|
||||
public GridCommsManager(NetworkServersInfo serversInfo) :base(serversInfo)
|
||||
public CommunicationsOGS1(NetworkServersInfo serversInfo) :base(serversInfo)
|
||||
{
|
||||
GridServer = gridInterComms;
|
||||
InterRegion = gridInterComms;
|
|
@ -13,8 +13,8 @@ namespace OpenSim.Region.Communications.OGS1
|
|||
{
|
||||
public class OGSUserServices :IUserServices
|
||||
{
|
||||
GridCommsManager m_parent;
|
||||
public OGSUserServices(GridCommsManager parent)
|
||||
CommunicationsOGS1 m_parent;
|
||||
public OGSUserServices(CommunicationsOGS1 parent)
|
||||
{
|
||||
m_parent = parent;
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<ProjectType>Local</ProjectType>
|
||||
<ProductVersion>8.0.50727</ProductVersion>
|
||||
|
@ -6,7 +6,8 @@
|
|||
<ProjectGuid>{4806E378-0000-0000-0000-000000000000}</ProjectGuid>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ApplicationIcon></ApplicationIcon>
|
||||
<ApplicationIcon>
|
||||
</ApplicationIcon>
|
||||
<AssemblyKeyContainerName>
|
||||
</AssemblyKeyContainerName>
|
||||
<AssemblyName>OpenSim.Region.Communications.OGS1</AssemblyName>
|
||||
|
@ -15,9 +16,11 @@
|
|||
<DefaultTargetSchema>IE50</DefaultTargetSchema>
|
||||
<DelaySign>false</DelaySign>
|
||||
<OutputType>Library</OutputType>
|
||||
<AppDesignerFolder></AppDesignerFolder>
|
||||
<AppDesignerFolder>
|
||||
</AppDesignerFolder>
|
||||
<RootNamespace>OpenSim.Region.Communications.OGS1</RootNamespace>
|
||||
<StartupObject></StartupObject>
|
||||
<StartupObject>
|
||||
</StartupObject>
|
||||
<FileUpgradeFlags>
|
||||
</FileUpgradeFlags>
|
||||
</PropertyGroup>
|
||||
|
@ -28,7 +31,8 @@
|
|||
<ConfigurationOverrideFile>
|
||||
</ConfigurationOverrideFile>
|
||||
<DefineConstants>TRACE;DEBUG</DefineConstants>
|
||||
<DocumentationFile></DocumentationFile>
|
||||
<DocumentationFile>
|
||||
</DocumentationFile>
|
||||
<DebugSymbols>True</DebugSymbols>
|
||||
<FileAlignment>4096</FileAlignment>
|
||||
<Optimize>False</Optimize>
|
||||
|
@ -37,7 +41,8 @@
|
|||
<RemoveIntegerChecks>False</RemoveIntegerChecks>
|
||||
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<NoWarn></NoWarn>
|
||||
<NoWarn>
|
||||
</NoWarn>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
|
||||
|
@ -46,7 +51,8 @@
|
|||
<ConfigurationOverrideFile>
|
||||
</ConfigurationOverrideFile>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<DocumentationFile></DocumentationFile>
|
||||
<DocumentationFile>
|
||||
</DocumentationFile>
|
||||
<DebugSymbols>False</DebugSymbols>
|
||||
<FileAlignment>4096</FileAlignment>
|
||||
<Optimize>True</Optimize>
|
||||
|
@ -55,7 +61,8 @@
|
|||
<RemoveIntegerChecks>False</RemoveIntegerChecks>
|
||||
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<NoWarn></NoWarn>
|
||||
<NoWarn>
|
||||
</NoWarn>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="libsecondlife.dll">
|
||||
|
@ -122,7 +129,7 @@
|
|||
<Compile Include="OGS1GridServices.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="GridCommsManager.cs">
|
||||
<Compile Include="CommunicationsOGS1.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="OGSUserServices.cs">
|
||||
|
|
Loading…
Reference in New Issue