*Reorganized RegionServerCommsManager for OGS and local support

7 files changed, 26 insertions, 26 deletions

diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index fa91d7d..2fc6516 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -145,10 +145,10 @@
     <Compile Include="ClientView.Grid.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ClientView.PacketHandlers.cs">

+    <Compile Include="PacketServer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ClientView.ProcessPackets.cs">

+    <Compile Include="ClientView.PacketHandlers.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="VersionInfo.cs">

@@ -169,10 +169,10 @@
     <Compile Include="ClientView.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="PacketServer.cs">

+    <Compile Include="ClientView.API.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ClientView.API.cs">

+    <Compile Include="ClientView.ProcessPackets.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="CAPS\AdminWebFront.cs">

diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index fc33eb9..c988025 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -18,16 +18,16 @@
                 <include name="OpenSimNetworkHandler.cs" />

                 <include name="UserConfigUtility.cs" />

                 <include name="ClientView.Grid.cs" />

+                <include name="PacketServer.cs" />

                 <include name="ClientView.PacketHandlers.cs" />

-                <include name="ClientView.ProcessPackets.cs" />

                 <include name="VersionInfo.cs" />

                 <include name="AgentAssetUpload.cs" />

                 <include name="ClientViewBase.cs" />

                 <include name="RegionServerBase.cs" />

                 <include name="CommsManager.cs" />

                 <include name="ClientView.cs" />

-                <include name="PacketServer.cs" />

                 <include name="ClientView.API.cs" />

+                <include name="ClientView.ProcessPackets.cs" />

                 <include name="CAPS/AdminWebFront.cs" />

                 <include name="Assets/InventoryCache.cs" />

                 <include name="Assets/AssetCache.cs" />

diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
index 7d90947..af8285b 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
+++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
@@ -96,10 +96,10 @@
     <Compile Include="MapStorage.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="UUIDPrimQuery.cs">

+    <Compile Include="UUIDParcelQuery.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="UUIDParcelQuery.cs">

+    <Compile Include="UUIDPrimQuery.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Db4LocalStorage.cs">

diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
index 9789712..72aac2a 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
+++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
@@ -13,8 +13,8 @@
             <sources failonempty="true">

                 <include name="AssemblyInfo.cs" />

                 <include name="MapStorage.cs" />

-                <include name="UUIDPrimQuery.cs" />

                 <include name="UUIDParcelQuery.cs" />

+                <include name="UUIDPrimQuery.cs" />

                 <include name="Db4LocalStorage.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

diff --git a/OpenSim/OpenSim.World/OpenSim.World.csproj b/OpenSim/OpenSim.World/OpenSim.World.csproj
index 90e455a..f2fb596 100644
--- a/OpenSim/OpenSim.World/OpenSim.World.csproj
+++ b/OpenSim/OpenSim.World/OpenSim.World.csproj
@@ -130,33 +130,33 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="Avatar.Client.cs">

-      <SubType>Code</SubType>

-    </Compile>

     <Compile Include="Entity.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="World.PacketHandlers.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="AvatarAnimations.cs">

+    <Compile Include="WorldBase.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="SceneObject.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Primitive.cs">

-      <SubType>Code</SubType>

-    </Compile>

     <Compile Include="World.Scripting.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="WorldBase.cs">

+    <Compile Include="Avatar.Client.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Avatar.Update.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="AvatarAnimations.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="Primitive.cs">

+      <SubType>Code</SubType>

+    </Compile>

     <Compile Include="Avatar.cs">

       <SubType>Code</SubType>

     </Compile>

@@ -166,6 +166,9 @@
     <Compile Include="World.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="Estate\EstateManager.cs">

+      <SubType>Code</SubType>

+    </Compile>

     <Compile Include="scripting\IScriptHandler.cs">

       <SubType>Code</SubType>

     </Compile>

@@ -190,9 +193,6 @@
     <Compile Include="types\Triangle.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Estate\EstateManager.cs">

-      <SubType>Code</SubType>

-    </Compile>

   </ItemGroup>

   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />

   <PropertyGroup>

diff --git a/OpenSim/OpenSim.World/World.cs b/OpenSim/OpenSim.World/World.cs
index 3e74501..011e39a 100644
--- a/OpenSim/OpenSim.World/World.cs
+++ b/OpenSim/OpenSim.World/World.cs
@@ -524,7 +524,7 @@ namespace OpenSim.world
         protected void InformClientOfNeighbours(IClientAPI remoteClient)

         {

             // Console.WriteLine("informing client of neighbouring regions");

-            List<RegionInfo> neighbours = this.commsManager.RequestNeighbours(this.m_regInfo);

+            List<RegionInfo> neighbours = this.commsManager.gridServer.RequestNeighbours(this.m_regInfo);

 

             //Console.WriteLine("we have " + neighbours.Count + " neighbouring regions");

             if (neighbours != null)

@@ -536,7 +536,7 @@ namespace OpenSim.world
                     agent.BaseFolder = LLUUID.Zero;

                     agent.InventoryFolder = LLUUID.Zero;

                     agent.startpos = new LLVector3(128, 128, 70);

-                    this.commsManager.InformNeighbourOfChildAgent(neighbours[i].RegionHandle, agent);

+                    this.commsManager.gridServer.InformNeighbourOfChildAgent(neighbours[i].RegionHandle, agent);

                     remoteClient.InformClientOfNeighbour(neighbours[i].RegionHandle, System.Net.IPAddress.Parse(neighbours[i].IPListenAddr), (ushort)neighbours[i].IPListenPort);

                 }

             }

@@ -594,7 +594,7 @@ namespace OpenSim.world
 

         public void RegisterRegionWithComms()

         {

-            this.regionCommsHost = this.commsManager.RegisterRegion(this.m_regInfo);

+            this.regionCommsHost = this.commsManager.gridServer.RegisterRegion(this.m_regInfo);

             if (this.regionCommsHost != null)

             {

                 this.regionCommsHost.OnExpectUser += new ExpectUserDelegate(this.NewUserConnection);

diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs
index 1864e06..1174455 100644
--- a/OpenSim/OpenSim/OpenSimMain.cs
+++ b/OpenSim/OpenSim/OpenSimMain.cs
@@ -103,12 +103,12 @@ namespace OpenSim
                 this.SetupLocalGridServers();

                 this.checkServer = new CheckSumServer(12036);

                 this.checkServer.ServerListener();

-                this.commsManager = new TestLocalCommsManager();

+                this.commsManager = new RegionServerCommsOGS();

             }

             else

             {

                 this.SetupRemoteGridServers();

-                this.commsManager = new TestLocalCommsManager(); //should be a remote comms manager class

+                this.commsManager = new RegionServerCommsLocal();

             }

 

             startuptime = DateTime.Now;

@@ -131,7 +131,7 @@ namespace OpenSim
                 loginServer = new LoginServer(regionData[0].IPListenAddr, regionData[0].IPListenPort, regionData[0].RegionLocX, regionData[0].RegionLocY, false);

                 loginServer.Startup();

                 //loginServer.SetSessionHandler(((AuthenticateSessionsLocal)this.AuthenticateSessionsHandler[0]).AddNewSession);

-                loginServer.SetSessionHandler(((TestLocalCommsManager)this.commsManager).AddNewSession);

+                loginServer.SetSessionHandler(((RegionServerCommsLocal)this.commsManager).gridServer.AddNewSession);

                 //sandbox mode with loginserver not using accounts

                 httpServer.AddXmlRPCHandler("login_to_simulator", loginServer.XmlRpcLoginMethod);

             }