From d3363bbc28442d70ea8c196e47e6c734f4c01a92 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Thu, 28 Jun 2007 17:03:09 +0000
Subject: *Renamed GridCommsManager to CommunicationsOGS1 to match
CommunicationsLocal -- its sandbox mode counterpart
---
OpenSim/Region/Application/OpenSimMain.cs | 2 +-
.../Communications/OGS1/CommunicationsOGS1.cs | 18 ++++++++
.../Region/Communications/OGS1/GridCommsManager.cs | 18 --------
.../Region/Communications/OGS1/OGSUserServices.cs | 4 +-
.../OGS1/OpenSim.Region.Communications.OGS1.csproj | 49 ++++++++++++----------
5 files changed, 49 insertions(+), 42 deletions(-)
create mode 100644 OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
delete mode 100644 OpenSim/Region/Communications/OGS1/GridCommsManager.cs
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 6e600b8..a5150e6 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -118,7 +118,7 @@ namespace OpenSim
else
{
this.SetupRemoteGridServers();
- this.commsManager = new GridCommsManager(this.serversData);
+ this.commsManager = new CommunicationsOGS1(this.serversData);
}
startuptime = DateTime.Now;
diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
new file mode 100644
index 0000000..f2b3b92
--- /dev/null
+++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Communications;
+namespace OpenSim.Region.Communications.OGS1
+{
+ public class CommunicationsOGS1 : CommunicationsManager
+ {
+ private OGS1GridServices gridInterComms = new OGS1GridServices();
+ public CommunicationsOGS1(NetworkServersInfo serversInfo) :base(serversInfo)
+ {
+ GridServer = gridInterComms;
+ InterRegion = gridInterComms;
+ UserServer = new OGSUserServices(this);
+ }
+ }
+}
diff --git a/OpenSim/Region/Communications/OGS1/GridCommsManager.cs b/OpenSim/Region/Communications/OGS1/GridCommsManager.cs
deleted file mode 100644
index 2bf9536..0000000
--- a/OpenSim/Region/Communications/OGS1/GridCommsManager.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Communications;
-namespace OpenSim.Region.Communications.OGS1
-{
- public class GridCommsManager : CommunicationsManager
- {
- private OGS1GridServices gridInterComms = new OGS1GridServices();
- public GridCommsManager(NetworkServersInfo serversInfo) :base(serversInfo)
- {
- GridServer = gridInterComms;
- InterRegion = gridInterComms;
- UserServer = new OGSUserServices(this);
- }
- }
-}
diff --git a/OpenSim/Region/Communications/OGS1/OGSUserServices.cs b/OpenSim/Region/Communications/OGS1/OGSUserServices.cs
index d41bdaf..56a7837 100644
--- a/OpenSim/Region/Communications/OGS1/OGSUserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGSUserServices.cs
@@ -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;
}
diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
index 2124bd9..b03ac7e 100644
--- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
@@ -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,30 +61,31 @@
<RemoveIntegerChecks>False</RemoveIntegerChecks>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
- <NoWarn></NoWarn>
+ <NoWarn>
+ </NoWarn>
</PropertyGroup>
<ItemGroup>
- <Reference Include="libsecondlife.dll" >
+ <Reference Include="libsecondlife.dll">
<HintPath>..\..\..\..\bin\libsecondlife.dll</HintPath>
<Private>False</Private>
</Reference>
- <Reference Include="System" >
+ <Reference Include="System">
<HintPath>System.dll</HintPath>
<Private>False</Private>
</Reference>
- <Reference Include="System.Data" >
+ <Reference Include="System.Data">
<HintPath>System.Data.dll</HintPath>
<Private>False</Private>
</Reference>
- <Reference Include="System.Runtime.Remoting" >
+ <Reference Include="System.Runtime.Remoting">
<HintPath>System.Runtime.Remoting.dll</HintPath>
<Private>False</Private>
</Reference>
- <Reference Include="System.Xml" >
+ <Reference Include="System.Xml">
<HintPath>System.Xml.dll</HintPath>
<Private>False</Private>
</Reference>
- <Reference Include="XMLRPC.dll" >
+ <Reference Include="XMLRPC.dll">
<HintPath>..\..\..\..\bin\XMLRPC.dll</HintPath>
<Private>False</Private>
</Reference>
@@ -88,31 +95,31 @@
<Name>OpenSim.Framework</Name>
<Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
- <Private>False</Private>
+ <Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\Framework\Communications\OpenSim.Framework.Communications.csproj">
<Name>OpenSim.Framework.Communications</Name>
<Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
- <Private>False</Private>
+ <Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\Framework\Console\OpenSim.Framework.Console.csproj">
<Name>OpenSim.Framework.Console</Name>
<Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
- <Private>False</Private>
+ <Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\Framework\Data\OpenSim.Framework.Data.csproj">
<Name>OpenSim.Framework.Data</Name>
<Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
- <Private>False</Private>
+ <Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\Framework\Servers\OpenSim.Framework.Servers.csproj">
<Name>OpenSim.Framework.Servers</Name>
<Project>{2CC71860-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
- <Private>False</Private>
+ <Private>False</Private>
</ProjectReference>
</ItemGroup>
<ItemGroup>
@@ -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">
@@ -139,4 +146,4 @@
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
-</Project>
+</Project>
\ No newline at end of file
--
cgit v1.1