2 files changed, 14 insertions, 14 deletions

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);