aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMW2007-06-10 19:08:51 +0000
committerMW2007-06-10 19:08:51 +0000
commitfd1a0a13749338ead01eddf59663704aae539ea7 (patch)
tree017c1a182764ecd1bd60f661f89e8e318b50bdfc
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 '')
-rw-r--r--Common/OpenGrid.Framework.Communications/InterSimComms/InterSimsCommsBase.cs19
-rw-r--r--Common/OpenGrid.Framework.Communications/InterSimComms/InterSimsCommsLocal.cs29
-rw-r--r--Common/OpenGrid.Framework.Communications/InterSimComms/InterSimsCommsOGS.cs16
-rw-r--r--Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj47
-rw-r--r--Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build3
-rw-r--r--Common/OpenGrid.Framework.Communications/RegionServerCommsLocal.cs16
-rw-r--r--Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs10
-rw-r--r--Common/OpenGrid.Framework.Communications/RegionServerCommsOGS.cs16
-rw-r--r--Common/OpenGrid.Framework.Communications/SandBoxManager.cs10
-rw-r--r--OpenSim/OpenSim.Region/World/World.cs6
-rw-r--r--OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj49
11 files changed, 127 insertions, 94 deletions
diff --git a/Common/OpenGrid.Framework.Communications/InterSimComms/InterSimsCommsBase.cs b/Common/OpenGrid.Framework.Communications/InterSimComms/InterSimsCommsBase.cs
new file mode 100644
index 0000000..972506f
--- /dev/null
+++ b/Common/OpenGrid.Framework.Communications/InterSimComms/InterSimsCommsBase.cs
@@ -0,0 +1,19 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using OpenSim.Framework.Types;
5using OpenSim.Framework;
6
7namespace OpenGrid.Framework.Communications
8{
9 public abstract class InterSimsCommsBase
10 {
11 /// <summary>
12 /// Informs a neighbouring sim to expect a child agent
13 /// </summary>
14 /// <param name="regionHandle"></param>
15 /// <param name="agentData"></param>
16 /// <returns></returns>
17 public abstract bool InformNeighbourOfChildAgent(ulong regionHandle, AgentCircuitData agentData);
18 }
19}
diff --git a/Common/OpenGrid.Framework.Communications/InterSimComms/InterSimsCommsLocal.cs b/Common/OpenGrid.Framework.Communications/InterSimComms/InterSimsCommsLocal.cs
new file mode 100644
index 0000000..bce146f
--- /dev/null
+++ b/Common/OpenGrid.Framework.Communications/InterSimComms/InterSimsCommsLocal.cs
@@ -0,0 +1,29 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using OpenSim.Framework.Types;
5using OpenSim.Framework;
6
7namespace OpenGrid.Framework.Communications
8{
9 public class InterSimsCommsLocal : InterSimsCommsBase
10 {
11 private SandBoxManager sandBoxManager;
12
13 public InterSimsCommsLocal(SandBoxManager sandManager)
14 {
15 sandBoxManager = sandManager;
16 }
17
18 /// <summary>
19 /// Informs a neighbouring sim to expect a child agent
20 /// </summary>
21 /// <param name="regionHandle"></param>
22 /// <param name="agentData"></param>
23 /// <returns></returns>
24 public override bool InformNeighbourOfChildAgent(ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData
25 {
26 return sandBoxManager.InformNeighbourOfChildAgent(regionHandle, agentData);
27 }
28 }
29}
diff --git a/Common/OpenGrid.Framework.Communications/InterSimComms/InterSimsCommsOGS.cs b/Common/OpenGrid.Framework.Communications/InterSimComms/InterSimsCommsOGS.cs
new file mode 100644
index 0000000..b6e98da
--- /dev/null
+++ b/Common/OpenGrid.Framework.Communications/InterSimComms/InterSimsCommsOGS.cs
@@ -0,0 +1,16 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using OpenSim.Framework.Types;
5using OpenSim.Framework;
6
7namespace OpenGrid.Framework.Communications
8{
9 public class InterSimsCommsOGS : InterSimsCommsBase
10 {
11 public override bool InformNeighbourOfChildAgent(ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData
12 {
13 return false;
14 }
15 }
16}
diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
index 21a0cd7..e8f10f0 100644
--- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
+++ b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.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>{683344D5-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{683344D5-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>OpenGrid.Framework.Communications</AssemblyName> 12 <AssemblyName>OpenGrid.Framework.Communications</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>OpenGrid.Framework.Communications</RootNamespace> 19 <RootNamespace>OpenGrid.Framework.Communications</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,20 +55,18 @@
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.Data" /> 65 <Reference Include="System.Xml" >
73 <Reference Include="System.Xml">
74 <HintPath>System.Xml.dll</HintPath> 66 <HintPath>System.Xml.dll</HintPath>
75 <Private>False</Private> 67 <Private>False</Private>
76 </Reference> 68 </Reference>
77 <Reference Include="libsecondlife.dll"> 69 <Reference Include="libsecondlife.dll" >
78 <HintPath>..\..\bin\libsecondlife.dll</HintPath> 70 <HintPath>..\..\bin\libsecondlife.dll</HintPath>
79 <Private>False</Private> 71 <Private>False</Private>
80 </Reference> 72 </Reference>
@@ -84,7 +76,7 @@
84 <Name>OpenSim.Framework</Name> 76 <Name>OpenSim.Framework</Name>
85 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> 77 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
86 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 78 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
87 <Private>False</Private> 79 <Private>False</Private>
88 </ProjectReference> 80 </ProjectReference>
89 </ItemGroup> 81 </ItemGroup>
90 <ItemGroup> 82 <ItemGroup>
@@ -97,6 +89,9 @@
97 <Compile Include="RegionServerCommsOGS.cs"> 89 <Compile Include="RegionServerCommsOGS.cs">
98 <SubType>Code</SubType> 90 <SubType>Code</SubType>
99 </Compile> 91 </Compile>
92 <Compile Include="SandBoxManager.cs">
93 <SubType>Code</SubType>
94 </Compile>
100 <Compile Include="GridServer\GridCommsManagerBase.cs"> 95 <Compile Include="GridServer\GridCommsManagerBase.cs">
101 <SubType>Code</SubType> 96 <SubType>Code</SubType>
102 </Compile> 97 </Compile>
@@ -106,10 +101,18 @@
106 <Compile Include="GridServer\GridCommsManagerOGS.cs"> 101 <Compile Include="GridServer\GridCommsManagerOGS.cs">
107 <SubType>Code</SubType> 102 <SubType>Code</SubType>
108 </Compile> 103 </Compile>
104 <Compile Include="InterSimComms\InterSimsCommsBase.cs">
105 <SubType>Code</SubType>
106 </Compile>
107 <Compile Include="InterSimComms\InterSimsCommsLocal.cs">
108 <SubType>Code</SubType>
109 </Compile>
110 <Compile Include="InterSimComms\InterSimsCommsOGS.cs">
111 <SubType>Code</SubType>
112 </Compile>
109 <Compile Include="Properties\AssemblyInfo.cs"> 113 <Compile Include="Properties\AssemblyInfo.cs">
110 <SubType>Code</SubType> 114 <SubType>Code</SubType>
111 </Compile> 115 </Compile>
112 <Compile Include="SandBoxManager.cs" />
113 <Compile Include="UserServer\UserCommsManagerBase.cs"> 116 <Compile Include="UserServer\UserCommsManagerBase.cs">
114 <SubType>Code</SubType> 117 <SubType>Code</SubType>
115 </Compile> 118 </Compile>
@@ -127,4 +130,4 @@
127 <PostBuildEvent> 130 <PostBuildEvent>
128 </PostBuildEvent> 131 </PostBuildEvent>
129 </PropertyGroup> 132 </PropertyGroup>
130</Project> \ No newline at end of file 133</Project>
diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build
index 952051b..069983c 100644
--- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build
+++ b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build
@@ -18,6 +18,9 @@
18 <include name="GridServer/GridCommsManagerBase.cs" /> 18 <include name="GridServer/GridCommsManagerBase.cs" />
19 <include name="GridServer/GridCommsManagerLocal.cs" /> 19 <include name="GridServer/GridCommsManagerLocal.cs" />
20 <include name="GridServer/GridCommsManagerOGS.cs" /> 20 <include name="GridServer/GridCommsManagerOGS.cs" />
21 <include name="InterSimComms/InterSimsCommsBase.cs" />
22 <include name="InterSimComms/InterSimsCommsLocal.cs" />
23 <include name="InterSimComms/InterSimsCommsOGS.cs" />
21 <include name="Properties/AssemblyInfo.cs" /> 24 <include name="Properties/AssemblyInfo.cs" />
22 <include name="UserServer/UserCommsManagerBase.cs" /> 25 <include name="UserServer/UserCommsManagerBase.cs" />
23 <include name="UserServer/UserCommsManagerLocal.cs" /> 26 <include name="UserServer/UserCommsManagerLocal.cs" />
diff --git a/Common/OpenGrid.Framework.Communications/RegionServerCommsLocal.cs b/Common/OpenGrid.Framework.Communications/RegionServerCommsLocal.cs
index bfcd15f..aeaeb7b 100644
--- a/Common/OpenGrid.Framework.Communications/RegionServerCommsLocal.cs
+++ b/Common/OpenGrid.Framework.Communications/RegionServerCommsLocal.cs
@@ -14,19 +14,11 @@ namespace OpenGrid.Framework.Communications
14 public SandBoxManager SandManager = new SandBoxManager(); 14 public SandBoxManager SandManager = new SandBoxManager();
15 public RegionServerCommsLocal() 15 public RegionServerCommsLocal()
16 { 16 {
17 userServer = new UserServer.UserCommsManagerLocal(); //Local User Server 17 UserServer = new UserServer.UserCommsManagerLocal(); //Local User Server
18 gridServer = new GridServer.GridCommsManagerLocal(SandManager); //Locl Grid Server 18 GridServer = new GridServer.GridCommsManagerLocal(SandManager); //Locl Grid Server
19 InterSims = new InterSimsCommsLocal(SandManager);
19 } 20 }
20 21
21 /// <summary> 22
22 /// informs a neighbouring sim to expect a child agent
23 /// </summary>
24 /// <param name="regionHandle"></param>
25 /// <param name="agentData"></param>
26 /// <returns></returns>
27 public override bool InformNeighbourOfChildAgent(ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData
28 {
29 return SandManager.InformNeighbourOfChildAgent(regionHandle, agentData);
30 }
31 } 23 }
32} 24}
diff --git a/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs b/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs
index 810477a..e48ac71 100644
--- a/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs
+++ b/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs
@@ -12,17 +12,13 @@ namespace OpenGrid.Framework.Communications
12 12
13 public class RegionServerCommsManager 13 public class RegionServerCommsManager
14 { 14 {
15 public UserServer.UserCommsManagerBase userServer; 15 public UserServer.UserCommsManagerBase UserServer;
16 public GridServer.GridCommsManagerBase gridServer; 16 public GridServer.GridCommsManagerBase GridServer;
17 public InterSimsCommsBase InterSims;
17 18
18 public RegionServerCommsManager() 19 public RegionServerCommsManager()
19 { 20 {
20 21
21 } 22 }
22
23 public virtual bool InformNeighbourOfChildAgent(ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData
24 {
25 return false;
26 }
27 } 23 }
28} 24}
diff --git a/Common/OpenGrid.Framework.Communications/RegionServerCommsOGS.cs b/Common/OpenGrid.Framework.Communications/RegionServerCommsOGS.cs
index 75b211d..02f17f0 100644
--- a/Common/OpenGrid.Framework.Communications/RegionServerCommsOGS.cs
+++ b/Common/OpenGrid.Framework.Communications/RegionServerCommsOGS.cs
@@ -10,20 +10,10 @@ namespace OpenGrid.Framework.Communications
10 { 10 {
11 public RegionServerCommsOGS() 11 public RegionServerCommsOGS()
12 { 12 {
13 userServer = new UserServer.UserCommsManagerOGS(); //Remote User Server 13 UserServer = new UserServer.UserCommsManagerOGS(); //Remote User Server
14 gridServer = new GridServer.GridCommsManagerOGS(); //Remote Grid Server 14 GridServer = new GridServer.GridCommsManagerOGS(); //Remote Grid Server
15 InterSims = new InterSimsCommsOGS();
15 } 16 }
16 17
17
18 /// <summary>
19 /// informs a neighbouring sim to expect a child agent
20 /// </summary>
21 /// <param name="regionHandle"></param>
22 /// <param name="agentData"></param>
23 /// <returns></returns>
24 public override bool InformNeighbourOfChildAgent(ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData
25 {
26 return false;
27 }
28 } 18 }
29} 19}
diff --git a/Common/OpenGrid.Framework.Communications/SandBoxManager.cs b/Common/OpenGrid.Framework.Communications/SandBoxManager.cs
index 4094658..dc2c3cb 100644
--- a/Common/OpenGrid.Framework.Communications/SandBoxManager.cs
+++ b/Common/OpenGrid.Framework.Communications/SandBoxManager.cs
@@ -19,9 +19,7 @@ namespace OpenGrid.Framework.Communications
19 } 19 }
20 20
21 /// <summary> 21 /// <summary>
22 /// Main Register a region method with the CommsManager. 22 /// Register a region method with the SandBoxManager.
23 /// Should do anything that is needed and also call the RegisterRegion method in the gridserver class
24 /// to inform the grid server (in grid mode).
25 /// </summary> 23 /// </summary>
26 /// <param name="regionInfo"></param> 24 /// <param name="regionInfo"></param>
27 /// <returns></returns> 25 /// <returns></returns>
@@ -43,9 +41,6 @@ namespace OpenGrid.Framework.Communications
43 } 41 }
44 42
45 /// <summary> 43 /// <summary>
46 /// In the current class structure this shouldn't be here as it should only be in the gridserver class
47 /// but having it there in sandbox mode makes things very difficult, so for now until something is sorted out
48 /// it will have to be here as well
49 /// </summary> 44 /// </summary>
50 /// <param name="regionInfo"></param> 45 /// <param name="regionInfo"></param>
51 /// <returns></returns> 46 /// <returns></returns>
@@ -73,9 +68,6 @@ namespace OpenGrid.Framework.Communications
73 } 68 }
74 69
75 /// <summary> 70 /// <summary>
76 /// informs a neighbouring sim to expect a child agent
77 /// I guess if we are going to stick with the current class structure then we need a intersim class
78 /// but think we need to really rethink the class structure as currently it makes things very messy for sandbox mode
79 /// </summary> 71 /// </summary>
80 /// <param name="regionHandle"></param> 72 /// <param name="regionHandle"></param>
81 /// <param name="agentData"></param> 73 /// <param name="agentData"></param>
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>