aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim.RegionServer/AuthenticateSessionsBase.cs2
-rw-r--r--OpenSim.RegionServer/SimClient.Grid.cs2
-rw-r--r--OpenSim.RegionServer/SimClient.cs4
-rw-r--r--OpenSim.RegionServer/UDPServer.cs2
-rw-r--r--OpenSim.RegionServer/world/SceneObject.cs1
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
9{ 9{
10 public class AuthenticateSessionsBase 10 public class AuthenticateSessionsBase
11 { 11 {
12 private Dictionary<uint, AgentCircuitData> AgentCircuits = new Dictionary<uint, AgentCircuitData>(); 12 public Dictionary<uint, AgentCircuitData> AgentCircuits = new Dictionary<uint, AgentCircuitData>();
13 13
14 public AuthenticateSessionsBase() 14 public AuthenticateSessionsBase()
15 { 15 {
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
33 33
34 RemoteGridBase gridServer = (RemoteGridBase)this.m_gridServer; 34 RemoteGridBase gridServer = (RemoteGridBase)this.m_gridServer;
35 35
36 Dictionary<uint, AgentCircuitData> agentCircuits = gridServer.agentcircuits; 36 Dictionary<uint, AgentCircuitData> agentCircuits = this.m_authenticateSessionsHandler.AgentCircuits;
37 AgentCircuitData agentCircuit; 37 AgentCircuitData agentCircuit;
38 38
39 if (agentCircuits.TryGetValue(CircuitCode, out agentCircuit)) 39 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
85 public bool m_sandboxMode; 85 public bool m_sandboxMode;
86 private int cachedtextureserial = 0; 86 private int cachedtextureserial = 0;
87 private RegionInfo m_regionData; 87 private RegionInfo m_regionData;
88 protected AuthenticateSessionsBase m_authenticateSessionsHandler;
88 89
89 protected static Dictionary<PacketType, PacketMethod> PacketHandlers = new Dictionary<PacketType, PacketMethod>(); //Global/static handlers for all clients 90 protected static Dictionary<PacketType, PacketMethod> PacketHandlers = new Dictionary<PacketType, PacketMethod>(); //Global/static handlers for all clients
90 91
@@ -98,7 +99,7 @@ namespace OpenSim
98 } 99 }
99 } 100 }
100 101
101 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) 102 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)
102 { 103 {
103 m_world = world; 104 m_world = world;
104 m_clientThreads = clientThreads; 105 m_clientThreads = clientThreads;
@@ -109,6 +110,7 @@ namespace OpenSim
109 m_sandboxMode = sandboxMode; 110 m_sandboxMode = sandboxMode;
110 m_child = child; 111 m_child = child;
111 m_regionData = regionDat; 112 m_regionData = regionDat;
113 m_authenticateSessionsHandler = authenSessions;
112 114
113 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs - Started up new client thread to handle incoming request"); 115 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs - Started up new client thread to handle incoming request");
114 cirpack = initialcirpack; 116 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
124 this.clientCircuits.Add(epSender, useCircuit.CircuitCode.Code); 124 this.clientCircuits.Add(epSender, useCircuit.CircuitCode.Code);
125 bool isChildAgent = false; 125 bool isChildAgent = false;
126 126
127 SimClient newuser = new SimClient(epSender, useCircuit, m_localWorld, _packetServer.ClientThreads, m_assetCache, m_gridServers.GridServer, this, m_inventoryCache, m_sandbox, isChildAgent, this.m_regionData); 127 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);
128 if ((this.m_gridServers.UserServer != null) && (user_accounts)) 128 if ((this.m_gridServers.UserServer != null) && (user_accounts))
129 { 129 {
130 newuser.UserServer = this.m_gridServers.UserServer; 130 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
16 private LLUUID rootUUID; 16 private LLUUID rootUUID;
17 private Dictionary<LLUUID, Primitive2> ChildPrimitives = new Dictionary<LLUUID, Primitive2>(); 17 private Dictionary<LLUUID, Primitive2> ChildPrimitives = new Dictionary<LLUUID, Primitive2>();
18 private Dictionary<uint, SimClient> m_clientThreads; 18 private Dictionary<uint, SimClient> m_clientThreads;
19 private World m_world;
19 20
20 public SceneObject() 21 public SceneObject()
21 { 22 {