Hopefully everything is working again

zircon^2
MW 2007-05-17 14:37:57 +00:00
parent 333e8fe54f
commit 915b8962a3
3 changed files with 15 additions and 12 deletions

View File

@ -73,5 +73,15 @@ namespace OpenSim
}
return vec;
}
public void UpdateAgentData(AgentCircuitData agentData)
{
if (this.AgentCircuits.ContainsKey((uint)agentData.circuitcode))
{
this.AgentCircuits[(uint)agentData.circuitcode].firstname = agentData.firstname;
this.AgentCircuits[(uint)agentData.circuitcode].lastname = agentData.lastname;
this.AgentCircuits[(uint)agentData.circuitcode].startpos = agentData.startpos;
}
}
}
}

View File

@ -116,15 +116,15 @@ namespace OpenSim
cirpack = initialcirpack;
userEP = remoteEP;
//currently not working due to changes in progress to the authenticating system.
/* if (m_gridServer.GetName() == "Remote")
if (m_gridServer.GetName() == "Remote")
{
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);

View File

@ -281,14 +281,7 @@ namespace OpenSim
RemoteGridBase gridServer = (RemoteGridBase)this.GridServers.GridServer;
AgentCircuitData agentCircuit;
if (gridServer.agentcircuits.TryGetValue(circuitcode, out agentCircuit))
{
agentCircuit.firstname = agent_data.firstname;
agentCircuit.lastname = agent_data.lastname;
agentCircuit.startpos = agent_data.startpos;
}
AuthenticateSessionsHandler.UpdateAgentData(agent_data);
return new XmlRpcResponse();
});