From 5f9b7321bc1bb449715bc3329d1bb5e092fee22b Mon Sep 17 00:00:00 2001
From: MW <Michaelwri22@yahoo.co.uk>
Date: Wed, 16 May 2007 18:11:09 +0000
Subject: [PATCH] a bit more refactoring

---
 .../AuthenticateSessionsBase.cs                | 10 ++++++++++
 .../AuthenticateSessionsLocal.cs               |  3 ++-
 OpenSim.RegionServer/OpenSimMain.cs            | 18 ++++++------------
 OpenSim.RegionServer/SimClient.cs              |  2 ++
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/OpenSim.RegionServer/AuthenticateSessionsBase.cs b/OpenSim.RegionServer/AuthenticateSessionsBase.cs
index 019fcc2266..b01ab7cd92 100644
--- a/OpenSim.RegionServer/AuthenticateSessionsBase.cs
+++ b/OpenSim.RegionServer/AuthenticateSessionsBase.cs
@@ -63,5 +63,15 @@ namespace OpenSim
                 this.AgentCircuits.Add(circuitCode, agentData);
             }
         }
+
+        public LLVector3 GetPosition(uint circuitCode)
+        {
+            LLVector3 vec = new LLVector3();
+            if (this.AgentCircuits.ContainsKey(circuitCode))
+            {
+                vec = this.AgentCircuits[circuitCode].startpos;
+            }
+            return vec;
+        }
     }
 }
diff --git a/OpenSim.RegionServer/AuthenticateSessionsLocal.cs b/OpenSim.RegionServer/AuthenticateSessionsLocal.cs
index ca46355c28..6c1c7d270c 100644
--- a/OpenSim.RegionServer/AuthenticateSessionsLocal.cs
+++ b/OpenSim.RegionServer/AuthenticateSessionsLocal.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using libsecondlife;
 using OpenSim.Framework.Types;
 
 namespace OpenSim
@@ -23,7 +24,7 @@ namespace OpenSim
             agent.circuitcode = loginData.CircuitCode;
             agent.BaseFolder = loginData.BaseFolder;
             agent.InventoryFolder = loginData.InventoryFolder;
-
+            agent.startpos = new LLVector3(128,128,70);
             this.AddNewCircuit(agent.circuitcode, agent);
         }
     }
diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs
index 55dab3b5cd..f78873d152 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim.RegionServer/OpenSimMain.cs
@@ -126,10 +126,16 @@ namespace OpenSim
             if (m_sandbox)
             {
                 this.SetupLocalGridServers();
+                //Authenticate Session Handler
+                AuthenticateSessionsLocal authen = new AuthenticateSessionsLocal();
+                this.AuthenticateSessionsHandler = authen;
             }
             else
             {
                 this.SetupRemoteGridServers();
+                //Authenticate Session Handler
+                AuthenticateSessionsRemote authen = new AuthenticateSessionsRemote();
+                this.AuthenticateSessionsHandler = authen;
             }
 
             startuptime = DateTime.Now;
@@ -145,18 +151,6 @@ namespace OpenSim
                 Environment.Exit(1);
             }
 
-            //Authenticate Session Handler
-            if (m_sandbox)
-            {
-                AuthenticateSessionsLocal authen = new AuthenticateSessionsLocal();
-                this.AuthenticateSessionsHandler = authen;
-            }
-            else
-            {
-                AuthenticateSessionsRemote authen = new AuthenticateSessionsRemote();
-                this.AuthenticateSessionsHandler = authen;
-            }
-
             m_udpServer = new UDPServer(this.regionData.IPListenPort, this.GridServers, this.AssetCache, this.InventoryCache, this.regionData, this.m_sandbox, this.user_accounts, this.m_console, this.AuthenticateSessionsHandler);
             
             //should be passing a IGenericConfig object to these so they can read the config data they want from it
diff --git a/OpenSim.RegionServer/SimClient.cs b/OpenSim.RegionServer/SimClient.cs
index 4cf2813ea1..0f107d9376 100644
--- a/OpenSim.RegionServer/SimClient.cs
+++ b/OpenSim.RegionServer/SimClient.cs
@@ -113,6 +113,8 @@ namespace OpenSim
             OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs - Started up new client thread to handle incoming request");
             cirpack = initialcirpack;
             userEP = remoteEP;
+
+            //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;