aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authormingchen2007-06-28 17:03:09 +0000
committermingchen2007-06-28 17:03:09 +0000
commitd3363bbc28442d70ea8c196e47e6c734f4c01a92 (patch)
tree52107ce7a8a2e9b42baefffed741443bc1cab8d3
parent*Master User is now set up (diff)
downloadopensim-SC-d3363bbc28442d70ea8c196e47e6c734f4c01a92.zip
opensim-SC-d3363bbc28442d70ea8c196e47e6c734f4c01a92.tar.gz
opensim-SC-d3363bbc28442d70ea8c196e47e6c734f4c01a92.tar.bz2
opensim-SC-d3363bbc28442d70ea8c196e47e6c734f4c01a92.tar.xz
*Renamed GridCommsManager to CommunicationsOGS1 to match CommunicationsLocal -- its sandbox mode counterpart
Diffstat
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs2
-rw-r--r--OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs (renamed from OpenSim/Region/Communications/OGS1/GridCommsManager.cs)4
-rw-r--r--OpenSim/Region/Communications/OGS1/OGSUserServices.cs4
-rw-r--r--OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj49
4 files changed, 33 insertions, 26 deletions
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
118 else 118 else
119 { 119 {
120 this.SetupRemoteGridServers(); 120 this.SetupRemoteGridServers();
121 this.commsManager = new GridCommsManager(this.serversData); 121 this.commsManager = new CommunicationsOGS1(this.serversData);
122 } 122 }
123 123
124 startuptime = DateTime.Now; 124 startuptime = DateTime.Now;
diff --git a/OpenSim/Region/Communications/OGS1/GridCommsManager.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
index 2bf9536..f2b3b92 100644
--- a/OpenSim/Region/Communications/OGS1/GridCommsManager.cs
+++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
@@ -5,10 +5,10 @@ using OpenSim.Framework.Types;
5using OpenSim.Framework.Communications; 5using OpenSim.Framework.Communications;
6namespace OpenSim.Region.Communications.OGS1 6namespace OpenSim.Region.Communications.OGS1
7{ 7{
8 public class GridCommsManager : CommunicationsManager 8 public class CommunicationsOGS1 : CommunicationsManager
9 { 9 {
10 private OGS1GridServices gridInterComms = new OGS1GridServices(); 10 private OGS1GridServices gridInterComms = new OGS1GridServices();
11 public GridCommsManager(NetworkServersInfo serversInfo) :base(serversInfo) 11 public CommunicationsOGS1(NetworkServersInfo serversInfo) :base(serversInfo)
12 { 12 {
13 GridServer = gridInterComms; 13 GridServer = gridInterComms;
14 InterRegion = gridInterComms; 14 InterRegion = gridInterComms;
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
13{ 13{
14 public class OGSUserServices :IUserServices 14 public class OGSUserServices :IUserServices
15 { 15 {
16 GridCommsManager m_parent; 16 CommunicationsOGS1 m_parent;
17 public OGSUserServices(GridCommsManager parent) 17 public OGSUserServices(CommunicationsOGS1 parent)
18 { 18 {
19 m_parent = parent; 19 m_parent = parent;
20 } 20 }
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 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup> 2 <PropertyGroup>
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
@@ -6,7 +6,8 @@
6 <ProjectGuid>{4806E378-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{4806E378-0000-0000-0000-000000000000}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon> 9 <ApplicationIcon>
10 </ApplicationIcon>
10 <AssemblyKeyContainerName> 11 <AssemblyKeyContainerName>
11 </AssemblyKeyContainerName> 12 </AssemblyKeyContainerName>
12 <AssemblyName>OpenSim.Region.Communications.OGS1</AssemblyName> 13 <AssemblyName>OpenSim.Region.Communications.OGS1</AssemblyName>
@@ -15,9 +16,11 @@
15 <DefaultTargetSchema>IE50</DefaultTargetSchema> 16 <DefaultTargetSchema>IE50</DefaultTargetSchema>
16 <DelaySign>false</DelaySign> 17 <DelaySign>false</DelaySign>
17 <OutputType>Library</OutputType> 18 <OutputType>Library</OutputType>
18 <AppDesignerFolder></AppDesignerFolder> 19 <AppDesignerFolder>
20 </AppDesignerFolder>
19 <RootNamespace>OpenSim.Region.Communications.OGS1</RootNamespace> 21 <RootNamespace>OpenSim.Region.Communications.OGS1</RootNamespace>
20 <StartupObject></StartupObject> 22 <StartupObject>
23 </StartupObject>
21 <FileUpgradeFlags> 24 <FileUpgradeFlags>
22 </FileUpgradeFlags> 25 </FileUpgradeFlags>
23 </PropertyGroup> 26 </PropertyGroup>
@@ -28,7 +31,8 @@
28 <ConfigurationOverrideFile> 31 <ConfigurationOverrideFile>
29 </ConfigurationOverrideFile> 32 </ConfigurationOverrideFile>
30 <DefineConstants>TRACE;DEBUG</DefineConstants> 33 <DefineConstants>TRACE;DEBUG</DefineConstants>
31 <DocumentationFile></DocumentationFile> 34 <DocumentationFile>
35 </DocumentationFile>
32 <DebugSymbols>True</DebugSymbols> 36 <DebugSymbols>True</DebugSymbols>
33 <FileAlignment>4096</FileAlignment> 37 <FileAlignment>4096</FileAlignment>
34 <Optimize>False</Optimize> 38 <Optimize>False</Optimize>
@@ -37,7 +41,8 @@
37 <RemoveIntegerChecks>False</RemoveIntegerChecks> 41 <RemoveIntegerChecks>False</RemoveIntegerChecks>
38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
39 <WarningLevel>4</WarningLevel> 43 <WarningLevel>4</WarningLevel>
40 <NoWarn></NoWarn> 44 <NoWarn>
45 </NoWarn>
41 </PropertyGroup> 46 </PropertyGroup>
42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 48 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -46,7 +51,8 @@
46 <ConfigurationOverrideFile> 51 <ConfigurationOverrideFile>
47 </ConfigurationOverrideFile> 52 </ConfigurationOverrideFile>
48 <DefineConstants>TRACE</DefineConstants> 53 <DefineConstants>TRACE</DefineConstants>
49 <DocumentationFile></DocumentationFile> 54 <DocumentationFile>
55 </DocumentationFile>
50 <DebugSymbols>False</DebugSymbols> 56 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment> 57 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize> 58 <Optimize>True</Optimize>
@@ -55,30 +61,31 @@
55 <RemoveIntegerChecks>False</RemoveIntegerChecks> 61 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 62 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
57 <WarningLevel>4</WarningLevel> 63 <WarningLevel>4</WarningLevel>
58 <NoWarn></NoWarn> 64 <NoWarn>
65 </NoWarn>
59 </PropertyGroup> 66 </PropertyGroup>
60 <ItemGroup> 67 <ItemGroup>
61 <Reference Include="libsecondlife.dll" > 68 <Reference Include="libsecondlife.dll">
62 <HintPath>..\..\..\..\bin\libsecondlife.dll</HintPath> 69 <HintPath>..\..\..\..\bin\libsecondlife.dll</HintPath>
63 <Private>False</Private> 70 <Private>False</Private>
64 </Reference> 71 </Reference>
65 <Reference Include="System" > 72 <Reference Include="System">
66 <HintPath>System.dll</HintPath> 73 <HintPath>System.dll</HintPath>
67 <Private>False</Private> 74 <Private>False</Private>
68 </Reference> 75 </Reference>
69 <Reference Include="System.Data" > 76 <Reference Include="System.Data">
70 <HintPath>System.Data.dll</HintPath> 77 <HintPath>System.Data.dll</HintPath>
71 <Private>False</Private> 78 <Private>False</Private>
72 </Reference> 79 </Reference>
73 <Reference Include="System.Runtime.Remoting" > 80 <Reference Include="System.Runtime.Remoting">
74 <HintPath>System.Runtime.Remoting.dll</HintPath> 81 <HintPath>System.Runtime.Remoting.dll</HintPath>
75 <Private>False</Private> 82 <Private>False</Private>
76 </Reference> 83 </Reference>
77 <Reference Include="System.Xml" > 84 <Reference Include="System.Xml">
78 <HintPath>System.Xml.dll</HintPath> 85 <HintPath>System.Xml.dll</HintPath>
79 <Private>False</Private> 86 <Private>False</Private>
80 </Reference> 87 </Reference>
81 <Reference Include="XMLRPC.dll" > 88 <Reference Include="XMLRPC.dll">
82 <HintPath>..\..\..\..\bin\XMLRPC.dll</HintPath> 89 <HintPath>..\..\..\..\bin\XMLRPC.dll</HintPath>
83 <Private>False</Private> 90 <Private>False</Private>
84 </Reference> 91 </Reference>
@@ -88,31 +95,31 @@
88 <Name>OpenSim.Framework</Name> 95 <Name>OpenSim.Framework</Name>
89 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> 96 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
90 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 97 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
91 <Private>False</Private> 98 <Private>False</Private>
92 </ProjectReference> 99 </ProjectReference>
93 <ProjectReference Include="..\..\..\Framework\Communications\OpenSim.Framework.Communications.csproj"> 100 <ProjectReference Include="..\..\..\Framework\Communications\OpenSim.Framework.Communications.csproj">
94 <Name>OpenSim.Framework.Communications</Name> 101 <Name>OpenSim.Framework.Communications</Name>
95 <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project> 102 <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>
96 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 103 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
97 <Private>False</Private> 104 <Private>False</Private>
98 </ProjectReference> 105 </ProjectReference>
99 <ProjectReference Include="..\..\..\Framework\Console\OpenSim.Framework.Console.csproj"> 106 <ProjectReference Include="..\..\..\Framework\Console\OpenSim.Framework.Console.csproj">
100 <Name>OpenSim.Framework.Console</Name> 107 <Name>OpenSim.Framework.Console</Name>
101 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> 108 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
102 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 109 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
103 <Private>False</Private> 110 <Private>False</Private>
104 </ProjectReference> 111 </ProjectReference>
105 <ProjectReference Include="..\..\..\Framework\Data\OpenSim.Framework.Data.csproj"> 112 <ProjectReference Include="..\..\..\Framework\Data\OpenSim.Framework.Data.csproj">
106 <Name>OpenSim.Framework.Data</Name> 113 <Name>OpenSim.Framework.Data</Name>
107 <Project>{36B72A9B-0000-0000-0000-000000000000}</Project> 114 <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
108 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 115 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
109 <Private>False</Private> 116 <Private>False</Private>
110 </ProjectReference> 117 </ProjectReference>
111 <ProjectReference Include="..\..\..\Framework\Servers\OpenSim.Framework.Servers.csproj"> 118 <ProjectReference Include="..\..\..\Framework\Servers\OpenSim.Framework.Servers.csproj">
112 <Name>OpenSim.Framework.Servers</Name> 119 <Name>OpenSim.Framework.Servers</Name>
113 <Project>{2CC71860-0000-0000-0000-000000000000}</Project> 120 <Project>{2CC71860-0000-0000-0000-000000000000}</Project>
114 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 121 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
115 <Private>False</Private> 122 <Private>False</Private>
116 </ProjectReference> 123 </ProjectReference>
117 </ItemGroup> 124 </ItemGroup>
118 <ItemGroup> 125 <ItemGroup>
@@ -122,7 +129,7 @@
122 <Compile Include="OGS1GridServices.cs"> 129 <Compile Include="OGS1GridServices.cs">
123 <SubType>Code</SubType> 130 <SubType>Code</SubType>
124 </Compile> 131 </Compile>
125 <Compile Include="GridCommsManager.cs"> 132 <Compile Include="CommunicationsOGS1.cs">
126 <SubType>Code</SubType> 133 <SubType>Code</SubType>
127 </Compile> 134 </Compile>
128 <Compile Include="OGSUserServices.cs"> 135 <Compile Include="OGSUserServices.cs">
@@ -139,4 +146,4 @@
139 <PostBuildEvent> 146 <PostBuildEvent>
140 </PostBuildEvent> 147 </PostBuildEvent>
141 </PropertyGroup> 148 </PropertyGroup>
142</Project> 149</Project> \ No newline at end of file
generated by cgit v1.1 at 2024-12-14 18:18:31 +0000