From 274ce6987e0b017800ddb62fe65143e0d5e1cae5 Mon Sep 17 00:00:00 2001
From: MW
Date: Sat, 19 May 2007 18:32:01 +0000
Subject: Border crossing back to mostly working, still seems a problem in that
 you need to stop walking just after you cross the border for it to work
 properly (else you will continue moving into a negative position in the first
 sim)

---
 OpenSim.RegionServer/SimClient.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'OpenSim.RegionServer/SimClient.cs')

diff --git a/OpenSim.RegionServer/SimClient.cs b/OpenSim.RegionServer/SimClient.cs
index daaa6dd..9ae08f4 100644
--- a/OpenSim.RegionServer/SimClient.cs
+++ b/OpenSim.RegionServer/SimClient.cs
@@ -118,7 +118,9 @@ namespace OpenSim
 
             if (m_gridServer.GetName() == "Remote")
             {
+                this.m_child = m_authenticateSessionsHandler.GetAgentChildStatus(initialcirpack.CircuitCode.Code);
                 this.startpos = m_authenticateSessionsHandler.GetPosition(initialcirpack.CircuitCode.Code);
+                //Console.WriteLine("start pos is " + this.startpos.X + " , " + this.startpos.Y + " , " + this.startpos.Z);
             }
             else
             {
@@ -142,13 +144,15 @@ namespace OpenSim
         # region Client Methods
         public void UpgradeClient()
         {
+            Console.WriteLine("updateclient being called");
             OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "SimClient.cs:UpgradeClient() - upgrading child to full agent");
             this.m_child = false;
             this.m_world.RemoveViewerAgent(this);
             if (!this.m_sandboxMode)
             {
-                this.startpos = ((RemoteGridBase)m_gridServer).agentcircuits[CircuitCode].startpos;
-                ((RemoteGridBase)m_gridServer).agentcircuits[CircuitCode].child = false;
+                this.startpos = m_authenticateSessionsHandler.GetPosition(CircuitCode);
+                m_authenticateSessionsHandler.UpdateAgentChildStatus(CircuitCode, false);
+                //Console.WriteLine("upgrade start pos is " + this.startpos.X + " , " + this.startpos.Y + " , " + this.startpos.Z);
             }
             this.InitNewClient();
         }
-- 
cgit v1.1