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
             }

             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;

+            }

+        }

     }

 }

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
             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);

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
 

                         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();

                     });