Attempt to fix trunk which someone broke <looks innocent>

5 files changed, 7 insertions, 4 deletions

diff --git a/OpenSim.RegionServer/AuthenticateSessionsBase.cs b/OpenSim.RegionServer/AuthenticateSessionsBase.cs
index b01ab7cd..1ff5a84 100644
--- a/OpenSim.RegionServer/AuthenticateSessionsBase.cs
+++ b/OpenSim.RegionServer/AuthenticateSessionsBase.cs
@@ -9,7 +9,7 @@ namespace OpenSim
 {

     public class AuthenticateSessionsBase

     {

-        private Dictionary<uint, AgentCircuitData> AgentCircuits = new Dictionary<uint, AgentCircuitData>();

+        public Dictionary<uint, AgentCircuitData> AgentCircuits = new Dictionary<uint, AgentCircuitData>();

 

         public AuthenticateSessionsBase()

         {

diff --git a/OpenSim.RegionServer/SimClient.Grid.cs b/OpenSim.RegionServer/SimClient.Grid.cs
index e5bd4ff..6aefa6f 100644
--- a/OpenSim.RegionServer/SimClient.Grid.cs
+++ b/OpenSim.RegionServer/SimClient.Grid.cs
@@ -33,7 +33,7 @@ namespace OpenSim
 

                 RemoteGridBase gridServer = (RemoteGridBase)this.m_gridServer;

 

-                Dictionary<uint, AgentCircuitData> agentCircuits = gridServer.agentcircuits;

+                Dictionary<uint, AgentCircuitData> agentCircuits = this.m_authenticateSessionsHandler.AgentCircuits;

                 AgentCircuitData agentCircuit;

 

                 if (agentCircuits.TryGetValue(CircuitCode, out agentCircuit))

diff --git a/OpenSim.RegionServer/SimClient.cs b/OpenSim.RegionServer/SimClient.cs
index 0f107d9..980e1d8 100644
--- a/OpenSim.RegionServer/SimClient.cs
+++ b/OpenSim.RegionServer/SimClient.cs
@@ -85,6 +85,7 @@ namespace OpenSim
         public bool m_sandboxMode;

         private int cachedtextureserial = 0;

         private RegionInfo m_regionData;

+        protected AuthenticateSessionsBase m_authenticateSessionsHandler;

 

         protected static Dictionary<PacketType, PacketMethod> PacketHandlers = new Dictionary<PacketType, PacketMethod>(); //Global/static handlers for all clients

 

@@ -98,7 +99,7 @@ namespace OpenSim
             }

         }

 

-        public SimClient(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, World world, Dictionary<uint, SimClient> clientThreads, AssetCache assetCache, IGridServer gridServer, OpenSimNetworkHandler application, InventoryCache inventoryCache, bool sandboxMode, bool child, RegionInfo regionDat)

+        public SimClient(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, World world, Dictionary<uint, SimClient> clientThreads, AssetCache assetCache, IGridServer gridServer, OpenSimNetworkHandler application, InventoryCache inventoryCache, bool sandboxMode, bool child, RegionInfo regionDat, AuthenticateSessionsBase authenSessions)

         {

             m_world = world;

             m_clientThreads = clientThreads;

@@ -109,6 +110,7 @@ namespace OpenSim
             m_sandboxMode = sandboxMode;

             m_child = child;

             m_regionData = regionDat;

+            m_authenticateSessionsHandler = authenSessions;

 

             OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs - Started up new client thread to handle incoming request");

             cirpack = initialcirpack;

diff --git a/OpenSim.RegionServer/UDPServer.cs b/OpenSim.RegionServer/UDPServer.cs
index e4ac042..b3b61c5 100644
--- a/OpenSim.RegionServer/UDPServer.cs
+++ b/OpenSim.RegionServer/UDPServer.cs
@@ -124,7 +124,7 @@ namespace OpenSim
             this.clientCircuits.Add(epSender, useCircuit.CircuitCode.Code);

             bool isChildAgent = false;

 

-            SimClient newuser = new SimClient(epSender, useCircuit, m_localWorld, _packetServer.ClientThreads, m_assetCache, m_gridServers.GridServer, this, m_inventoryCache, m_sandbox, isChildAgent, this.m_regionData);

+            SimClient newuser = new SimClient(epSender, useCircuit, m_localWorld, _packetServer.ClientThreads, m_assetCache, m_gridServers.GridServer, this, m_inventoryCache, m_sandbox, isChildAgent, this.m_regionData, m_authenticateSessionsClass);

             if ((this.m_gridServers.UserServer != null) && (user_accounts))

             {

                 newuser.UserServer = this.m_gridServers.UserServer;

diff --git a/OpenSim.RegionServer/world/SceneObject.cs b/OpenSim.RegionServer/world/SceneObject.cs
index 2dbba5c..5b5a7b2 100644
--- a/OpenSim.RegionServer/world/SceneObject.cs
+++ b/OpenSim.RegionServer/world/SceneObject.cs
@@ -16,6 +16,7 @@ namespace OpenSim.world
         private LLUUID rootUUID;

         private Dictionary<LLUUID, Primitive2> ChildPrimitives = new Dictionary<LLUUID, Primitive2>();

         private Dictionary<uint, SimClient> m_clientThreads;

+        private World m_world;

 

         public SceneObject()

         {