Attempt 2

2 files changed, 8 insertions, 18 deletions

diff --git a/OpenSim.RegionServer/SimClient.Grid.cs b/OpenSim.RegionServer/SimClient.Grid.cs
index 6aefa6f..2f3be0e 100644
--- a/OpenSim.RegionServer/SimClient.Grid.cs
+++ b/OpenSim.RegionServer/SimClient.Grid.cs
@@ -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);

-                }

+                

             }

         }

 

diff --git a/OpenSim.RegionServer/SimClient.cs b/OpenSim.RegionServer/SimClient.cs
index 980e1d8..ab20846 100644
--- a/OpenSim.RegionServer/SimClient.cs
+++ b/OpenSim.RegionServer/SimClient.cs
@@ -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);