OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Attempt to fix trunk which someone broke <looks innocent>

zircon^2
MW 2007-05-17 13:23:53 +00:00
parent 65a7e3b6cb
commit 9c6f28bd4e
5 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim.RegionServer/AuthenticateSessionsBase.cs
View File

@ -9,7 +9,7 @@ namespace OpenSim
{ {
public class AuthenticateSessionsBase public class AuthenticateSessionsBase
{ {
private Dictionary<uint, AgentCircuitData> AgentCircuits = new Dictionary<uint, AgentCircuitData>(); public Dictionary<uint, AgentCircuitData> AgentCircuits = new Dictionary<uint, AgentCircuitData>();
public AuthenticateSessionsBase() public AuthenticateSessionsBase()
{ {

2
OpenSim.RegionServer/SimClient.Grid.cs
View File

@ -33,7 +33,7 @@ namespace OpenSim
RemoteGridBase gridServer = (RemoteGridBase)this.m_gridServer; RemoteGridBase gridServer = (RemoteGridBase)this.m_gridServer;
Dictionary<uint, AgentCircuitData> agentCircuits = gridServer.agentcircuits; Dictionary<uint, AgentCircuitData> agentCircuits = this.m_authenticateSessionsHandler.AgentCircuits;
AgentCircuitData agentCircuit; AgentCircuitData agentCircuit;
if (agentCircuits.TryGetValue(CircuitCode, out agentCircuit)) if (agentCircuits.TryGetValue(CircuitCode, out agentCircuit))

4
OpenSim.RegionServer/SimClient.cs
View File

@ -85,6 +85,7 @@ namespace OpenSim
public bool m_sandboxMode; public bool m_sandboxMode;
private int cachedtextureserial = 0; private int cachedtextureserial = 0;
private RegionInfo m_regionData; private RegionInfo m_regionData;
protected AuthenticateSessionsBase m_authenticateSessionsHandler;
protected static Dictionary<PacketType, PacketMethod> PacketHandlers = new Dictionary<PacketType, PacketMethod>(); //Global/static handlers for all clients 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_world = world;
m_clientThreads = clientThreads; m_clientThreads = clientThreads;
@ -109,6 +110,7 @@ namespace OpenSim
m_sandboxMode = sandboxMode; m_sandboxMode = sandboxMode;
m_child = child; m_child = child;
m_regionData = regionDat; 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"); OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs - Started up new client thread to handle incoming request");
cirpack = initialcirpack; cirpack = initialcirpack;

2
OpenSim.RegionServer/UDPServer.cs
View File

@ -124,7 +124,7 @@ namespace OpenSim
this.clientCircuits.Add(epSender, useCircuit.CircuitCode.Code); this.clientCircuits.Add(epSender, useCircuit.CircuitCode.Code);
bool isChildAgent = false; 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)) if ((this.m_gridServers.UserServer != null) && (user_accounts))
{ {
newuser.UserServer = this.m_gridServers.UserServer; newuser.UserServer = this.m_gridServers.UserServer;

1
OpenSim.RegionServer/world/SceneObject.cs
View File

@ -16,6 +16,7 @@ namespace OpenSim.world
private LLUUID rootUUID; private LLUUID rootUUID;
private Dictionary<LLUUID, Primitive2> ChildPrimitives = new Dictionary<LLUUID, Primitive2>(); private Dictionary<LLUUID, Primitive2> ChildPrimitives = new Dictionary<LLUUID, Primitive2>();
private Dictionary<uint, SimClient> m_clientThreads; private Dictionary<uint, SimClient> m_clientThreads;
private World m_world;
public SceneObject() public SceneObject()
{ {