aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMW2007-05-17 14:37:57 +0000
committerMW2007-05-17 14:37:57 +0000
commit915b8962a37b2dd0e5e75540862f5347c820b2dc (patch)
tree84040b06ec9a4273305234dcb1b21f2db36f8bf2
parent* minor rearrangement for clarity (diff)
downloadopensim-SC_OLD-915b8962a37b2dd0e5e75540862f5347c820b2dc.zip
opensim-SC_OLD-915b8962a37b2dd0e5e75540862f5347c820b2dc.tar.gz
opensim-SC_OLD-915b8962a37b2dd0e5e75540862f5347c820b2dc.tar.bz2
opensim-SC_OLD-915b8962a37b2dd0e5e75540862f5347c820b2dc.tar.xz
Hopefully everything is working again
-rw-r--r--OpenSim.RegionServer/AuthenticateSessionsBase.cs10
-rw-r--r--OpenSim.RegionServer/SimClient.cs8
-rw-r--r--OpenSim/OpenSimMain.cs9
3 files changed, 15 insertions, 12 deletions
diff --git a/OpenSim.RegionServer/AuthenticateSessionsBase.cs b/OpenSim.RegionServer/AuthenticateSessionsBase.cs
index 1ff5a84..cf6a055 100644
--- a/OpenSim.RegionServer/AuthenticateSessionsBase.cs
+++ b/OpenSim.RegionServer/AuthenticateSessionsBase.cs
@@ -73,5 +73,15 @@ namespace OpenSim
73 } 73 }
74 return vec; 74 return vec;
75 } 75 }
76
77 public void UpdateAgentData(AgentCircuitData agentData)
78 {
79 if (this.AgentCircuits.ContainsKey((uint)agentData.circuitcode))
80 {
81 this.AgentCircuits[(uint)agentData.circuitcode].firstname = agentData.firstname;
82 this.AgentCircuits[(uint)agentData.circuitcode].lastname = agentData.lastname;
83 this.AgentCircuits[(uint)agentData.circuitcode].startpos = agentData.startpos;
84 }
85 }
76 } 86 }
77} 87}
diff --git a/OpenSim.RegionServer/SimClient.cs b/OpenSim.RegionServer/SimClient.cs
index ab20846..daaa6dd 100644
--- a/OpenSim.RegionServer/SimClient.cs
+++ b/OpenSim.RegionServer/SimClient.cs
@@ -116,15 +116,15 @@ namespace OpenSim
116 cirpack = initialcirpack; 116 cirpack = initialcirpack;
117 userEP = remoteEP; 117 userEP = remoteEP;
118 118
119 //currently not working due to changes in progress to the authenticating system. 119 if (m_gridServer.GetName() == "Remote")
120 /* if (m_gridServer.GetName() == "Remote")
121 { 120 {
122 this.startpos = m_authenticateSessionsHandler.GetPosition(initialcirpack.CircuitCode.Code); 121 this.startpos = m_authenticateSessionsHandler.GetPosition(initialcirpack.CircuitCode.Code);
123 } 122 }
124 else 123 else
125 {*/ 124 {
126 this.startpos = new LLVector3(128, 128, m_world.Terrain[(int)128, (int)128] + 15.0f); // new LLVector3(128.0f, 128.0f, 60f); 125 this.startpos = new LLVector3(128, 128, m_world.Terrain[(int)128, (int)128] + 15.0f); // new LLVector3(128.0f, 128.0f, 60f);
127 // } 126 }
127
128 PacketQueue = new BlockingQueue<QueItem>(); 128 PacketQueue = new BlockingQueue<QueItem>();
129 129
130 this.UploadAssets = new AgentAssetUpload(this, m_assetCache, m_inventoryCache); 130 this.UploadAssets = new AgentAssetUpload(this, m_assetCache, m_inventoryCache);
diff --git a/OpenSim/OpenSimMain.cs b/OpenSim/OpenSimMain.cs
index 8edadc3..d4b78a7 100644
--- a/OpenSim/OpenSimMain.cs
+++ b/OpenSim/OpenSimMain.cs
@@ -281,14 +281,7 @@ namespace OpenSim
281 281
282 RemoteGridBase gridServer = (RemoteGridBase)this.GridServers.GridServer; 282 RemoteGridBase gridServer = (RemoteGridBase)this.GridServers.GridServer;
283 283
284 AgentCircuitData agentCircuit; 284 AuthenticateSessionsHandler.UpdateAgentData(agent_data);
285
286 if (gridServer.agentcircuits.TryGetValue(circuitcode, out agentCircuit))
287 {
288 agentCircuit.firstname = agent_data.firstname;
289 agentCircuit.lastname = agent_data.lastname;
290 agentCircuit.startpos = agent_data.startpos;
291 }
292 285
293 return new XmlRpcResponse(); 286 return new XmlRpcResponse();
294 }); 287 });