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

Attempt 2

zircon^2
MW 2007-05-17 13:39:30 +00:00
parent 9c6f28bd4e
commit 60ceda3cfc
2 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,12 +33,6 @@ namespace OpenSim
RemoteGridBase gridServer = (RemoteGridBase)this.m_gridServer;
Dictionary<uint, AgentCircuitData> agentCircuits = this.m_authenticateSessionsHandler.AgentCircuits;
AgentCircuitData agentCircuit;
if (agentCircuits.TryGetValue(CircuitCode, out agentCircuit))
{
foreach (Hashtable neighbour in gridServer.neighbours)
{
string neighbourIPStr = (string)neighbour["sim_ip"];
@ -49,11 +43,11 @@ namespace OpenSim
Console.WriteLine(reqUrl);
SimParams = new Hashtable();
SimParams["session_id"] = agentCircuit.SessionID.ToString();
SimParams["secure_session_id"] = agentCircuit.SecureSessionID.ToString();
SimParams["firstname"] = agentCircuit.firstname;
SimParams["lastname"] = agentCircuit.lastname;
SimParams["agent_id"] = agentCircuit.AgentID.ToString();
SimParams["session_id"] = this.SessionID.ToString();
SimParams["secure_session_id"] = this.SecureSessionID.ToString();
SimParams["firstname"] = this.ClientAvatar.firstname;
SimParams["lastname"] = this.ClientAvatar.lastname;
SimParams["agent_id"] = this.AgentID;
SimParams["circuit_code"] = (Int32)this.CircuitCode;
SimParams["child_agent"] = "1";
SendParams = new ArrayList();
@ -80,11 +74,7 @@ namespace OpenSim
this.OutPacket(enable);
}
enablePackets.Clear();
}
else
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.CRITICAL, "SimClient.cs: Couldn't find AgentCircuit for CircuitCode {0}.", CircuitCode);
}
}
}

4
OpenSim.RegionServer/SimClient.cs
View File

@ -119,12 +119,12 @@ namespace OpenSim
//currently not working due to changes in progress to the authenticating system.
/* if (m_gridServer.GetName() == "Remote")
{
this.startpos = ((RemoteGridBase)m_gridServer).agentcircuits[initialcirpack.CircuitCode.Code].startpos;
this.startpos = m_authenticateSessionsHandler.GetPosition(initialcirpack.CircuitCode.Code);
}
else
{*/
this.startpos = new LLVector3(128, 128, m_world.Terrain[(int)128, (int)128] + 15.0f); // new LLVector3(128.0f, 128.0f, 60f);
//}
// }
PacketQueue = new BlockingQueue<QueItem>();
this.UploadAssets = new AgentAssetUpload(this, m_assetCache, m_inventoryCache);