From fa8f143aec69e36ee90fb34e2f144733b66ca951 Mon Sep 17 00:00:00 2001
From: mingchen <mingchen>
Date: Sat, 9 Jun 2007 21:04:13 +0000
Subject: [PATCH] *Reorganized RegionServerCommsManager for OGS and local
 support

---
 .../GridServer/GridCommsManagerBase.cs        |  50 ++++
 .../GridCommsManagerLocal.cs}                 |  41 ++--
 .../GridServer/GridCommsManagerOGS.cs         |  36 +++
 .../OpenGrid.Framework.Communications.csproj  |  25 +-
 .../RegionServerCommsLocal.cs                 |  20 ++
 .../RegionServerCommsManager.cs               |  60 +----
 .../RegionServerCommsOGS.cs                   |  15 ++
 .../UserServer/UserCommsManagerBase.cs        |  30 +++
 .../UserServer/UserCommsManagerLocal.cs       |  10 +
 .../UserServer/UserCommsManagerOGS.cs         |  10 +
 .../OpenSim.Framework.csproj                  |   6 +-
 .../OpenSim.Framework.dll.build               |   2 +-
 OpenGridServices.build                        |   3 -
 OpenGridServices.sln                          | 115 +++++----
 OpenGridServices.suo                          | Bin 139776 -> 139776 bytes
 OpenSim.sln                                   | 231 +++++++++++-------
 .../OpenSim.RegionServer.csproj               |   8 +-
 .../OpenSim.RegionServer.dll.build            |   4 +-
 .../OpenSim.Storage.LocalStorageDb4o.csproj   |   4 +-
 ...OpenSim.Storage.LocalStorageDb4o.dll.build |   2 +-
 OpenSim/OpenSim.World/OpenSim.World.csproj    |  22 +-
 OpenSim/OpenSim.World/World.cs                |   6 +-
 OpenSim/OpenSim/OpenSimMain.cs                |   6 +-
 23 files changed, 444 insertions(+), 262 deletions(-)
 create mode 100644 Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerBase.cs
 rename Common/OpenGrid.Framework.Communications/{TestLocalCommsManager.cs => GridServer/GridCommsManagerLocal.cs} (77%)
 create mode 100644 Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerOGS.cs
 create mode 100644 Common/OpenGrid.Framework.Communications/RegionServerCommsLocal.cs
 create mode 100644 Common/OpenGrid.Framework.Communications/RegionServerCommsOGS.cs
 create mode 100644 Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerBase.cs
 create mode 100644 Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerLocal.cs
 create mode 100644 Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerOGS.cs

diff --git a/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerBase.cs b/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerBase.cs
new file mode 100644
index 0000000000..11b5ea7b8f
--- /dev/null
+++ b/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerBase.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Types;
+using OpenSim.Framework;
+
+namespace OpenGrid.Framework.Communications.GridServer
+{
+    public class GridCommsManagerBase
+    {
+        public GridCommsManagerBase()
+        {
+        }
+         /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="regionInfo"></param>
+        /// <returns></returns>
+        public virtual RegionCommsHostBase RegisterRegion(RegionInfo regionInfo)
+        {
+            return null;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="regionInfo"></param>
+        /// <returns></returns>
+        public virtual List<RegionInfo> RequestNeighbours(RegionInfo regionInfo)
+        {
+            return null;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool InformNeighbourOfChildAgent(ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData
+        {
+           return false;
+        }
+
+        public virtual bool AddNewSession(ulong regionHandle, Login loginData)
+        {
+            return false;
+        }
+
+       
+    }
+}
diff --git a/Common/OpenGrid.Framework.Communications/TestLocalCommsManager.cs b/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerLocal.cs
similarity index 77%
rename from Common/OpenGrid.Framework.Communications/TestLocalCommsManager.cs
rename to Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerLocal.cs
index fad20012d8..774585a6f3 100644
--- a/Common/OpenGrid.Framework.Communications/TestLocalCommsManager.cs
+++ b/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerLocal.cs
@@ -1,29 +1,24 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Text;
-using libsecondlife;
+
 using OpenSim.Framework;
-using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 
-namespace OpenGrid.Framework.Communications
+using libsecondlife;
+
+namespace OpenGrid.Framework.Communications.GridServer
 {
-    public class TestLocalCommsManager : RegionServerCommsManager
+    public class GridCommsManagerLocal : GridCommsManagerBase
     {
-        protected Dictionary<ulong, RegionInfo> regions = new Dictionary<ulong,RegionInfo>();
+        protected Dictionary<ulong, RegionInfo> regions = new Dictionary<ulong, RegionInfo>();
         protected Dictionary<ulong, RegionCommsHostBase> regionHosts = new Dictionary<ulong, RegionCommsHostBase>();
 
-        public TestLocalCommsManager()
+        public GridCommsManagerLocal()
         {
 
         }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="regionInfo"></param>
-        /// <returns></returns>
         public override RegionCommsHostBase RegisterRegion(RegionInfo regionInfo)
         {
             //Console.WriteLine("CommsManager - Region " + regionInfo.RegionHandle + " , " + regionInfo.RegionLocX + " , "+ regionInfo.RegionLocY +" is registering");
@@ -32,27 +27,23 @@ namespace OpenGrid.Framework.Communications
                 //Console.WriteLine("CommsManager - Adding Region " + regionInfo.RegionHandle );
                 this.regions.Add(regionInfo.RegionHandle, regionInfo);
                 RegionCommsHostBase regionHost = new RegionCommsHostBase();
-                this.regionHosts.Add(regionInfo.RegionHandle, regionHost); 
+                this.regionHosts.Add(regionInfo.RegionHandle, regionHost);
                 return regionHost;
             }
-      
+
             //already in our list of regions so for now lets return null
             return null;
         }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="regionInfo"></param>
-        /// <returns></returns>
+
         public override List<RegionInfo> RequestNeighbours(RegionInfo regionInfo)
         {
-           // Console.WriteLine("Finding Neighbours to " + regionInfo.RegionHandle);
+            // Console.WriteLine("Finding Neighbours to " + regionInfo.RegionHandle);
             List<RegionInfo> neighbours = new List<RegionInfo>();
 
             foreach (RegionInfo reg in this.regions.Values)
             {
-               // Console.WriteLine("CommsManager- RequestNeighbours() checking region " + reg.RegionLocX + " , "+ reg.RegionLocY);
+                // Console.WriteLine("CommsManager- RequestNeighbours() checking region " + reg.RegionLocX + " , "+ reg.RegionLocY);
                 if (reg.RegionHandle != regionInfo.RegionHandle)
                 {
                     //Console.WriteLine("CommsManager- RequestNeighbours() - found a different region in list, checking location");
@@ -68,16 +59,12 @@ namespace OpenGrid.Framework.Communications
             return neighbours;
         }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <returns></returns>
         public override bool InformNeighbourOfChildAgent(ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData
         {
             //Console.WriteLine("CommsManager- Trying to Inform a region to expect child agent");
             if (this.regionHosts.ContainsKey(regionHandle))
             {
-               // Console.WriteLine("CommsManager- Informing a region to expect child agent");
+                // Console.WriteLine("CommsManager- Informing a region to expect child agent");
                 this.regionHosts[regionHandle].TriggerExpectUser(regionHandle, agentData);
                 return true;
             }
@@ -90,7 +77,7 @@ namespace OpenGrid.Framework.Communications
         /// <param name="regionHandle"></param>
         /// <param name="loginData"></param>
         /// <returns></returns>
-        public bool AddNewSession(ulong regionHandle, Login loginData)
+        public override bool AddNewSession(ulong regionHandle, Login loginData)
         {
             //Console.WriteLine(" comms manager been told to expect new user");
             AgentCircuitData agent = new AgentCircuitData();
diff --git a/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerOGS.cs b/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerOGS.cs
new file mode 100644
index 0000000000..415c1d8579
--- /dev/null
+++ b/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerOGS.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using OpenSim.Framework;
+using OpenSim.Framework.Types;
+
+namespace OpenGrid.Framework.Communications.GridServer
+{
+    public class GridCommsManagerOGS : GridCommsManagerBase
+    {
+        public GridCommsManagerOGS()
+        {
+        }
+
+        public override RegionCommsHostBase RegisterRegion(RegionInfo regionInfo)
+        {
+            return null;
+        }
+
+        public override List<RegionInfo> RequestNeighbours(RegionInfo regionInfo)
+        {
+            return null;
+        }
+
+        public override bool InformNeighbourOfChildAgent(ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData
+        {
+            return false;
+        }
+
+        public override bool AddNewSession(ulong regionHandle, Login loginData)
+        {
+            return false;
+        }
+    }
+}
diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
index 00b1548b58..689210bdd1 100644
--- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
+++ b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
@@ -80,13 +80,34 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="RegionServerCommsLocal.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="RegionServerCommsOGS.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="RegionServerCommsManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="TestLocalCommsManager.cs">
+    <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs">
+    <Compile Include="UserServer\UserCommsManagerOGS.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="UserServer\UserCommsManagerLocal.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="UserServer\UserCommsManagerBase.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="GridServer\GridCommsManagerLocal.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="GridServer\GridCommsManagerOGS.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="GridServer\GridCommsManagerBase.cs">
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
diff --git a/Common/OpenGrid.Framework.Communications/RegionServerCommsLocal.cs b/Common/OpenGrid.Framework.Communications/RegionServerCommsLocal.cs
new file mode 100644
index 0000000000..0743cbf182
--- /dev/null
+++ b/Common/OpenGrid.Framework.Communications/RegionServerCommsLocal.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+using OpenSim.Framework;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+
+namespace OpenGrid.Framework.Communications
+{
+    public class RegionServerCommsLocal : RegionServerCommsManager
+    {
+        public RegionServerCommsLocal()
+        {
+            userServer = new UserServer.UserCommsManagerLocal(); //Local User Server
+            gridServer = new GridServer.GridCommsManagerLocal(); //Locl Grid Server
+        }
+    }
+}
diff --git a/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs b/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs
index fa786d38b3..38bce42078 100644
--- a/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs
+++ b/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs
@@ -12,66 +12,12 @@ namespace OpenGrid.Framework.Communications
  
     public class RegionServerCommsManager
     {
+        public UserServer.UserCommsManagerBase userServer;
+        public GridServer.GridCommsManagerBase gridServer;
 
         public RegionServerCommsManager()
         {
-
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <returns></returns>
-        public virtual RegionInfo LoadRegionConfigFromGridServer(LLUUID regionID)
-        {
-            return null;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="regionInfo"></param>
-        /// <returns></returns>
-        public virtual RegionCommsHostBase RegisterRegion(RegionInfo regionInfo)
-        {
-            return null;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="regionInfo"></param>
-        /// <returns></returns>
-        public virtual List<RegionInfo> RequestNeighbours(RegionInfo regionInfo)
-        {
-            return null;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <returns></returns>
-        public virtual bool InformNeighbourOfChildAgent( ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData
-        {
-            return false;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <returns></returns>
-        public virtual bool AvatarCrossingToRegion()
-        {
-            return false;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <returns></returns>
-        public virtual IList RequestMapBlocks()
-        {
-            return null;
+            
         }
     }
 }
diff --git a/Common/OpenGrid.Framework.Communications/RegionServerCommsOGS.cs b/Common/OpenGrid.Framework.Communications/RegionServerCommsOGS.cs
new file mode 100644
index 0000000000..b0db4739b2
--- /dev/null
+++ b/Common/OpenGrid.Framework.Communications/RegionServerCommsOGS.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenGrid.Framework.Communications
+{
+    public class RegionServerCommsOGS : RegionServerCommsManager
+    {
+        public RegionServerCommsOGS()
+        {
+            userServer = new UserServer.UserCommsManagerOGS(); //Remote User Server
+            gridServer = new GridServer.GridCommsManagerOGS(); //Remote Grid Server
+        }
+    }
+}
diff --git a/Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerBase.cs b/Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerBase.cs
new file mode 100644
index 0000000000..9ea4ae8bc1
--- /dev/null
+++ b/Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerBase.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using libsecondlife;
+namespace OpenGrid.Framework.Communications.UserServer
+{
+    public class UserCommsManagerBase
+    {
+        public UserCommsManagerBase()
+        {
+        }
+
+        public virtual UserProfileData GetUserProfile(string name)
+        {
+            return null;
+        }
+        public virtual UserProfileData GetUserProfile(LLUUID avatar_id)
+        {
+            return null;
+        }
+    }
+
+    public class UserProfileData
+    {
+        public UserProfileData()
+        {
+        }
+    }
+}
diff --git a/Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerLocal.cs b/Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerLocal.cs
new file mode 100644
index 0000000000..eb0881a4b0
--- /dev/null
+++ b/Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerLocal.cs
@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenGrid.Framework.Communications.UserServer
+{
+    public class UserCommsManagerLocal : UserCommsManagerBase
+    {
+    }
+}
diff --git a/Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerOGS.cs b/Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerOGS.cs
new file mode 100644
index 0000000000..09215356e7
--- /dev/null
+++ b/Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerOGS.cs
@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenGrid.Framework.Communications.UserServer
+{
+    public class UserCommsManagerOGS : UserCommsManagerBase
+    {
+    }
+}
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj
index ab29d04d47..7e14e6a94c 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/Common/OpenSim.Framework/OpenSim.Framework.csproj
@@ -195,6 +195,9 @@
     <Compile Include="Types\NetworkServersInfo.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Types\RegionInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Types\ParcelData.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -225,9 +228,6 @@
     <Compile Include="Types\AssetBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Types\RegionInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.dll.build b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
index a45a1216f8..2678e54c17 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -46,6 +46,7 @@
                 <include name="Properties/AssemblyInfo.cs" />
                 <include name="Types/NeighbourInfo.cs" />
                 <include name="Types/NetworkServersInfo.cs" />
+                <include name="Types/RegionInfo.cs" />
                 <include name="Types/ParcelData.cs" />
                 <include name="Types/AgentWearable.cs" />
                 <include name="Types/PrimData.cs" />
@@ -56,7 +57,6 @@
                 <include name="Types/Login.cs" />
                 <include name="Types/AssetLandmark.cs" />
                 <include name="Types/AssetBase.cs" />
-                <include name="Types/RegionInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
diff --git a/OpenGridServices.build b/OpenGridServices.build
index d240dc08f7..f1cbab8bd4 100644
--- a/OpenGridServices.build
+++ b/OpenGridServices.build
@@ -51,7 +51,6 @@
         <nant buildfile="OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="clean" />
         <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build" target="clean" />
         <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="clean" />
-        <nant buildfile="OpenGridServices/ServiceManager/ServiceManager.exe.build" target="clean" />
         <nant buildfile="OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build" target="clean" />
         <nant buildfile="OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" />
         <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build" target="clean" />
@@ -67,7 +66,6 @@
         <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build" target="build" />
         <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build" target="build" />
         <nant buildfile="OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build" target="build" />
-        <nant buildfile="OpenGridServices/ServiceManager/ServiceManager.exe.build" target="build" />
         <nant buildfile="OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="build" />
         <nant buildfile="OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build" target="build" />
         <nant buildfile="OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="build" />
@@ -88,7 +86,6 @@
         <nant buildfile="OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="doc" />
         <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build" target="doc" />
         <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="doc" />
-        <nant buildfile="OpenGridServices/ServiceManager/ServiceManager.exe.build" target="doc" />
         <nant buildfile="OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build" target="doc" />
         <nant buildfile="OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" />
         <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build" target="doc" />
diff --git a/OpenGridServices.sln b/OpenGridServices.sln
index 3996190067..86cb4ad621 100644
--- a/OpenGridServices.sln
+++ b/OpenGridServices.sln
@@ -23,57 +23,66 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data.MySQL", "OpenGridServices\OpenGrid.Framework.Data.MySQL\OpenGrid.Framework.Data.MySQL.csproj", "{0F3C3AC1-0000-0000-0000-000000000000}"
 EndProject
 Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0021261B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0021261B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
+  GlobalSection(SolutionConfigurationPlatforms) = preSolution
+    Debug|Any CPU = Debug|Any CPU
+    Release|Any CPU = Release|Any CPU
+  EndGlobalSection
+  GlobalSection(ProjectDependencies) = postSolution
+    ({1E3F341A-0000-0000-0000-000000000000}).4 = ({62CDF671-0000-0000-0000-000000000000})
+    ({39BD9497-0000-0000-0000-000000000000}).3 = ({62CDF671-0000-0000-0000-000000000000})
+    ({21BFC8E2-0000-0000-0000-000000000000}).6 = ({62CDF671-0000-0000-0000-000000000000})
+    ({21BFC8E2-0000-0000-0000-000000000000}).7 = ({7924FD35-0000-0000-0000-000000000000})
+    ({0A563AC1-0000-0000-0000-000000000000}).3 = ({62CDF671-0000-0000-0000-000000000000})
+    ({66591469-0000-0000-0000-000000000000}).5 = ({62CDF671-0000-0000-0000-000000000000})
+    ({0F3C3AC1-0000-0000-0000-000000000000}).3 = ({62CDF671-0000-0000-0000-000000000000})
+  EndGlobalSection
+  GlobalSection(ProjectConfigurationPlatforms) = postSolution
+    {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+  EndGlobalSection
+  GlobalSection(SolutionProperties) = preSolution
+    HideSolutionNode = FALSE
+  EndGlobalSection
 EndGlobal
diff --git a/OpenGridServices.suo b/OpenGridServices.suo
index acde093678a841a2b1b4c2ffdfce19258d7e7c7e..728df77f08d566812024a1ee65b8963805e2bc84 100644
GIT binary patch
delta 5372
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

delta 3867
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
afyae4$xhZi)9Ar5rDD`!bi<)62>lx!D>jn=

diff --git a/OpenSim.sln b/OpenSim.sln
index d2036f0103..33a72172cd 100644
--- a/OpenSim.sln
+++ b/OpenSim.sln
@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C# Express 2005
+# Visual Studio 2005
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{A7CD0630-0000-0000-0000-000000000000}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}"
@@ -41,93 +41,144 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLRPC", "Common\XmlRpcCS\XMLRPC.csproj", "{8E81D43C-0000-0000-0000-000000000000}"
 EndProject
 Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{683344D5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{683344D5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{642A14A8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{642A14A8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{642A14A8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{642A14A8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{97A82740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{97A82740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
+  GlobalSection(SolutionConfigurationPlatforms) = preSolution
+    Debug|Any CPU = Debug|Any CPU
+    Release|Any CPU = Release|Any CPU
+  EndGlobalSection
+  GlobalSection(ProjectDependencies) = postSolution
+    ({EE9E5D96-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({EE9E5D96-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({63A05FE9-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000})
+    ({683344D5-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({642A14A8-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000})
+    ({642A14A8-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({642A14A8-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({642A14A8-0000-0000-0000-000000000000}).8 = ({E88EF749-0000-0000-0000-000000000000})
+    ({642A14A8-0000-0000-0000-000000000000}).9 = ({8BE16150-0000-0000-0000-000000000000})
+    ({642A14A8-0000-0000-0000-000000000000}).10 = ({8BB20F0A-0000-0000-0000-000000000000})
+    ({642A14A8-0000-0000-0000-000000000000}).11 = ({8E81D43C-0000-0000-0000-000000000000})
+    ({642A14A8-0000-0000-0000-000000000000}).12 = ({683344D5-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).8 = ({8BE16150-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).9 = ({8BB20F0A-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).10 = ({642A14A8-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).11 = ({632E1BFD-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).12 = ({E88EF749-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).13 = ({683344D5-0000-0000-0000-000000000000})
+    ({438A9556-0000-0000-0000-000000000000}).14 = ({8E81D43C-0000-0000-0000-000000000000})
+    ({632E1BFD-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000})
+    ({632E1BFD-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({632E1BFD-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({632E1BFD-0000-0000-0000-000000000000}).8 = ({E88EF749-0000-0000-0000-000000000000})
+    ({632E1BFD-0000-0000-0000-000000000000}).9 = ({8BE16150-0000-0000-0000-000000000000})
+    ({632E1BFD-0000-0000-0000-000000000000}).10 = ({8BB20F0A-0000-0000-0000-000000000000})
+    ({632E1BFD-0000-0000-0000-000000000000}).11 = ({8E81D43C-0000-0000-0000-000000000000})
+    ({E88EF749-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({8BE16150-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({8BE16150-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({4F874463-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000})
+    ({988F0AC4-0000-0000-0000-000000000000}).3 = ({8BE16150-0000-0000-0000-000000000000})
+    ({B55C0B5D-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({B55C0B5D-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({B55C0B5D-0000-0000-0000-000000000000}).5 = ({8E81D43C-0000-0000-0000-000000000000})
+    ({8ACA2445-0000-0000-0000-000000000000}).4 = ({8E81D43C-0000-0000-0000-000000000000})
+    ({8ACA2445-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({8BB20F0A-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({8BB20F0A-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({8BB20F0A-0000-0000-0000-000000000000}).5 = ({8E81D43C-0000-0000-0000-000000000000})
+    ({E1B79ECF-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({E1B79ECF-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({6B20B603-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({6B20B603-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000})
+    ({97A82740-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({546099CD-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000})
+    ({546099CD-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})
+  EndGlobalSection
+  GlobalSection(ProjectConfigurationPlatforms) = postSolution
+    {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {642A14A8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {642A14A8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {642A14A8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {642A14A8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+    {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+  EndGlobalSection
+  GlobalSection(SolutionProperties) = preSolution
+    HideSolutionNode = FALSE
+  EndGlobalSection
 EndGlobal
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index fa91d7db67..2fc651680f 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 fc33eb9af5..c988025b10 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 7d90947523..af8285b32b 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 9789712114..72aac2a670 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 90e455aa74..f2fb596ba1 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 3e745018b5..011e39a839 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 1864e063be..1174455738 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);
             }