4 files changed, 3 insertions, 8 deletions

diff --git a/OpenSim/OpenSim.Region/World/Primitive.cs b/OpenSim/OpenSim.Region/World/Primitive.cs
index c800f21..99e349d 100644
--- a/OpenSim/OpenSim.Region/World/Primitive.cs
+++ b/OpenSim/OpenSim.Region/World/Primitive.cs
@@ -224,7 +224,6 @@ namespace OpenSim.Region
         public void UpdateTexture(byte[] tex)

         {

             this.primData.Texture = tex;

-            //this.dirtyFlag = true;

         }

 

         /// <summary>

@@ -387,8 +386,6 @@ namespace OpenSim.Region
                 lPos = this.Pos;

                 lRot = this.rotation;

             }

-

-           

         }

 

         /// <summary>

diff --git a/OpenSim/OpenSim.Region/World/World.cs b/OpenSim/OpenSim.Region/World/World.cs
index 49ba8fa..cf0382a 100644
--- a/OpenSim/OpenSim.Region/World/World.cs
+++ b/OpenSim/OpenSim.Region/World/World.cs
@@ -544,7 +544,7 @@ namespace OpenSim.Region
         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)

@@ -617,7 +617,7 @@ namespace OpenSim.Region
         /// </summary>

         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.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index 8384407..f19da49 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -12,8 +12,6 @@
             </resources>

             <sources failonempty="true">

                 <include name="AgentAssetUpload.cs" />

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

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

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

                 <include name="ClientView.cs" />

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

diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs
index bd07c8f..489a949 100644
--- a/OpenSim/OpenSim/OpenSimMain.cs
+++ b/OpenSim/OpenSim/OpenSimMain.cs
@@ -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(((RegionServerCommsLocal)this.commsManager).AddNewSession);

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

                 //sandbox mode with loginserver not using accounts

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

             }