aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMW2007-06-10 19:08:51 +0000
committerMW2007-06-10 19:08:51 +0000
commitfd1a0a13749338ead01eddf59663704aae539ea7 (patch)
tree017c1a182764ecd1bd60f661f89e8e318b50bdfc /OpenSim
parentAdded SandBoxManager which in sandbox mode, acts as the backend server for th... (diff)
downloadopensim-SC_OLD-fd1a0a13749338ead01eddf59663704aae539ea7.zip
opensim-SC_OLD-fd1a0a13749338ead01eddf59663704aae539ea7.tar.gz
opensim-SC_OLD-fd1a0a13749338ead01eddf59663704aae539ea7.tar.bz2
opensim-SC_OLD-fd1a0a13749338ead01eddf59663704aae539ea7.tar.xz
Added InterSimComms (Likely to be renamed) to the commsManager and moved the InformClientOfNeighbours method into that.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/OpenSim.Region/World/World.cs6
-rw-r--r--OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj49
2 files changed, 24 insertions, 31 deletions
diff --git a/OpenSim/OpenSim.Region/World/World.cs b/OpenSim/OpenSim.Region/World/World.cs
index cf0382a..aad09b3 100644
--- a/OpenSim/OpenSim.Region/World/World.cs
+++ b/OpenSim/OpenSim.Region/World/World.cs
@@ -544,7 +544,7 @@ namespace OpenSim.Region
544 protected void InformClientOfNeighbours(IClientAPI remoteClient) 544 protected void InformClientOfNeighbours(IClientAPI remoteClient)
545 { 545 {
546 // Console.WriteLine("informing client of neighbouring regions"); 546 // Console.WriteLine("informing client of neighbouring regions");
547 List<RegionInfo> neighbours = this.commsManager.gridServer.RequestNeighbours(this.m_regInfo); 547 List<RegionInfo> neighbours = this.commsManager.GridServer.RequestNeighbours(this.m_regInfo);
548 548
549 //Console.WriteLine("we have " + neighbours.Count + " neighbouring regions"); 549 //Console.WriteLine("we have " + neighbours.Count + " neighbouring regions");
550 if (neighbours != null) 550 if (neighbours != null)
@@ -556,7 +556,7 @@ namespace OpenSim.Region
556 agent.BaseFolder = LLUUID.Zero; 556 agent.BaseFolder = LLUUID.Zero;
557 agent.InventoryFolder = LLUUID.Zero; 557 agent.InventoryFolder = LLUUID.Zero;
558 agent.startpos = new LLVector3(128, 128, 70); 558 agent.startpos = new LLVector3(128, 128, 70);
559 this.commsManager.InformNeighbourOfChildAgent(neighbours[i].RegionHandle, agent); 559 this.commsManager.InterSims.InformNeighbourOfChildAgent(neighbours[i].RegionHandle, agent);
560 remoteClient.InformClientOfNeighbour(neighbours[i].RegionHandle, System.Net.IPAddress.Parse(neighbours[i].IPListenAddr), (ushort)neighbours[i].IPListenPort); 560 remoteClient.InformClientOfNeighbour(neighbours[i].RegionHandle, System.Net.IPAddress.Parse(neighbours[i].IPListenAddr), (ushort)neighbours[i].IPListenPort);
561 } 561 }
562 } 562 }
@@ -617,7 +617,7 @@ namespace OpenSim.Region
617 /// </summary> 617 /// </summary>
618 public void RegisterRegionWithComms() 618 public void RegisterRegionWithComms()
619 { 619 {
620 this.regionCommsHost = this.commsManager.gridServer.RegisterRegion(this.m_regInfo); 620 this.regionCommsHost = this.commsManager.GridServer.RegisterRegion(this.m_regInfo);
621 if (this.regionCommsHost != null) 621 if (this.regionCommsHost != null)
622 { 622 {
623 this.regionCommsHost.OnExpectUser += new ExpectUserDelegate(this.NewUserConnection); 623 this.regionCommsHost.OnExpectUser += new ExpectUserDelegate(this.NewUserConnection);
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index 04febf0..59440e6 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.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,8 +6,7 @@
6 <ProjectGuid>{632E1BFD-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{632E1BFD-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> 9 <ApplicationIcon></ApplicationIcon>
10 </ApplicationIcon>
11 <AssemblyKeyContainerName> 10 <AssemblyKeyContainerName>
12 </AssemblyKeyContainerName> 11 </AssemblyKeyContainerName>
13 <AssemblyName>OpenSim.RegionServer</AssemblyName> 12 <AssemblyName>OpenSim.RegionServer</AssemblyName>
@@ -16,11 +15,9 @@
16 <DefaultTargetSchema>IE50</DefaultTargetSchema> 15 <DefaultTargetSchema>IE50</DefaultTargetSchema>
17 <DelaySign>false</DelaySign> 16 <DelaySign>false</DelaySign>
18 <OutputType>Library</OutputType> 17 <OutputType>Library</OutputType>
19 <AppDesignerFolder> 18 <AppDesignerFolder></AppDesignerFolder>
20 </AppDesignerFolder>
21 <RootNamespace>OpenSim.RegionServer</RootNamespace> 19 <RootNamespace>OpenSim.RegionServer</RootNamespace>
22 <StartupObject> 20 <StartupObject></StartupObject>
23 </StartupObject>
24 <FileUpgradeFlags> 21 <FileUpgradeFlags>
25 </FileUpgradeFlags> 22 </FileUpgradeFlags>
26 </PropertyGroup> 23 </PropertyGroup>
@@ -31,8 +28,7 @@
31 <ConfigurationOverrideFile> 28 <ConfigurationOverrideFile>
32 </ConfigurationOverrideFile> 29 </ConfigurationOverrideFile>
33 <DefineConstants>TRACE;DEBUG</DefineConstants> 30 <DefineConstants>TRACE;DEBUG</DefineConstants>
34 <DocumentationFile> 31 <DocumentationFile></DocumentationFile>
35 </DocumentationFile>
36 <DebugSymbols>True</DebugSymbols> 32 <DebugSymbols>True</DebugSymbols>
37 <FileAlignment>4096</FileAlignment> 33 <FileAlignment>4096</FileAlignment>
38 <Optimize>False</Optimize> 34 <Optimize>False</Optimize>
@@ -41,8 +37,7 @@
41 <RemoveIntegerChecks>False</RemoveIntegerChecks> 37 <RemoveIntegerChecks>False</RemoveIntegerChecks>
42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
43 <WarningLevel>4</WarningLevel> 39 <WarningLevel>4</WarningLevel>
44 <NoWarn> 40 <NoWarn></NoWarn>
45 </NoWarn>
46 </PropertyGroup> 41 </PropertyGroup>
47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
48 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -51,8 +46,7 @@
51 <ConfigurationOverrideFile> 46 <ConfigurationOverrideFile>
52 </ConfigurationOverrideFile> 47 </ConfigurationOverrideFile>
53 <DefineConstants>TRACE</DefineConstants> 48 <DefineConstants>TRACE</DefineConstants>
54 <DocumentationFile> 49 <DocumentationFile></DocumentationFile>
55 </DocumentationFile>
56 <DebugSymbols>False</DebugSymbols> 50 <DebugSymbols>False</DebugSymbols>
57 <FileAlignment>4096</FileAlignment> 51 <FileAlignment>4096</FileAlignment>
58 <Optimize>True</Optimize> 52 <Optimize>True</Optimize>
@@ -61,27 +55,26 @@
61 <RemoveIntegerChecks>False</RemoveIntegerChecks> 55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
62 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
63 <WarningLevel>4</WarningLevel> 57 <WarningLevel>4</WarningLevel>
64 <NoWarn> 58 <NoWarn></NoWarn>
65 </NoWarn>
66 </PropertyGroup> 59 </PropertyGroup>
67 <ItemGroup> 60 <ItemGroup>
68 <Reference Include="System"> 61 <Reference Include="System" >
69 <HintPath>System.dll</HintPath> 62 <HintPath>System.dll</HintPath>
70 <Private>False</Private> 63 <Private>False</Private>
71 </Reference> 64 </Reference>
72 <Reference Include="System.Xml"> 65 <Reference Include="System.Xml" >
73 <HintPath>System.Xml.dll</HintPath> 66 <HintPath>System.Xml.dll</HintPath>
74 <Private>False</Private> 67 <Private>False</Private>
75 </Reference> 68 </Reference>
76 <Reference Include="libsecondlife.dll"> 69 <Reference Include="libsecondlife.dll" >
77 <HintPath>..\..\bin\libsecondlife.dll</HintPath> 70 <HintPath>..\..\bin\libsecondlife.dll</HintPath>
78 <Private>False</Private> 71 <Private>False</Private>
79 </Reference> 72 </Reference>
80 <Reference Include="Axiom.MathLib.dll"> 73 <Reference Include="Axiom.MathLib.dll" >
81 <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath> 74 <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath>
82 <Private>False</Private> 75 <Private>False</Private>
83 </Reference> 76 </Reference>
84 <Reference Include="Db4objects.Db4o.dll"> 77 <Reference Include="Db4objects.Db4o.dll" >
85 <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath> 78 <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>
86 <Private>False</Private> 79 <Private>False</Private>
87 </Reference> 80 </Reference>
@@ -91,43 +84,43 @@
91 <Name>OpenSim.Terrain.BasicTerrain</Name> 84 <Name>OpenSim.Terrain.BasicTerrain</Name>
92 <Project>{2270B8FE-0000-0000-0000-000000000000}</Project> 85 <Project>{2270B8FE-0000-0000-0000-000000000000}</Project>
93 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 86 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
94 <Private>False</Private> 87 <Private>False</Private>
95 </ProjectReference> 88 </ProjectReference>
96 <ProjectReference Include="..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj"> 89 <ProjectReference Include="..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj">
97 <Name>OpenSim.Framework</Name> 90 <Name>OpenSim.Framework</Name>
98 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> 91 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
99 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 92 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
100 <Private>False</Private> 93 <Private>False</Private>
101 </ProjectReference> 94 </ProjectReference>
102 <ProjectReference Include="..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> 95 <ProjectReference Include="..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
103 <Name>OpenSim.Framework.Console</Name> 96 <Name>OpenSim.Framework.Console</Name>
104 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> 97 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
105 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 98 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
106 <Private>False</Private> 99 <Private>False</Private>
107 </ProjectReference> 100 </ProjectReference>
108 <ProjectReference Include="..\..\Common\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj"> 101 <ProjectReference Include="..\..\Common\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj">
109 <Name>OpenSim.GenericConfig.Xml</Name> 102 <Name>OpenSim.GenericConfig.Xml</Name>
110 <Project>{E88EF749-0000-0000-0000-000000000000}</Project> 103 <Project>{E88EF749-0000-0000-0000-000000000000}</Project>
111 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 104 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
112 <Private>False</Private> 105 <Private>False</Private>
113 </ProjectReference> 106 </ProjectReference>
114 <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj"> 107 <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj">
115 <Name>OpenSim.Physics.Manager</Name> 108 <Name>OpenSim.Physics.Manager</Name>
116 <Project>{8BE16150-0000-0000-0000-000000000000}</Project> 109 <Project>{8BE16150-0000-0000-0000-000000000000}</Project>
117 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 110 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
118 <Private>False</Private> 111 <Private>False</Private>
119 </ProjectReference> 112 </ProjectReference>
120 <ProjectReference Include="..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj"> 113 <ProjectReference Include="..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj">
121 <Name>OpenSim.Servers</Name> 114 <Name>OpenSim.Servers</Name>
122 <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project> 115 <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>
123 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 116 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
124 <Private>False</Private> 117 <Private>False</Private>
125 </ProjectReference> 118 </ProjectReference>
126 <ProjectReference Include="..\..\Common\XmlRpcCS\XMLRPC.csproj"> 119 <ProjectReference Include="..\..\Common\XmlRpcCS\XMLRPC.csproj">
127 <Name>XMLRPC</Name> 120 <Name>XMLRPC</Name>
128 <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> 121 <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
129 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 122 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
130 <Private>False</Private> 123 <Private>False</Private>
131 </ProjectReference> 124 </ProjectReference>
132 </ItemGroup> 125 </ItemGroup>
133 <ItemGroup> 126 <ItemGroup>
@@ -193,4 +186,4 @@
193 <PostBuildEvent> 186 <PostBuildEvent>
194 </PostBuildEvent> 187 </PostBuildEvent>
195 </PropertyGroup> 188 </PropertyGroup>
196</Project> \ No newline at end of file 189</Project>