From f42d1fc825b7b9d22ae05836992531d9abd2a26d Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Tue, 27 Mar 2007 21:42:14 +0000
Subject: * revert the revert - begin the beguine

---
 .../UserServer/LocalUserProfileManager.cs              | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'OpenSim.RegionServer/UserServer/LocalUserProfileManager.cs')

diff --git a/OpenSim.RegionServer/UserServer/LocalUserProfileManager.cs b/OpenSim.RegionServer/UserServer/LocalUserProfileManager.cs
index 83e340b..eee1c3a 100644
--- a/OpenSim.RegionServer/UserServer/LocalUserProfileManager.cs
+++ b/OpenSim.RegionServer/UserServer/LocalUserProfileManager.cs
@@ -12,11 +12,15 @@ namespace OpenSim.UserServer
 {
     class LocalUserProfileManager : UserProfileManager 
     {
-        private IGridServer _gridServer;
+        private IGridServer m_gridServer;
+        private int m_port;
+        private string m_ipAddr;
 
-        public LocalUserProfileManager(IGridServer gridServer)
+        public LocalUserProfileManager(IGridServer gridServer, int simPort, string ipAddr)
 		{
-			_gridServer = gridServer;
+			m_gridServer = gridServer;
+            m_port = simPort;
+            m_ipAddr = ipAddr;
 		}
 
         public override void InitUserProfiles()
@@ -29,8 +33,8 @@ namespace OpenSim.UserServer
             uint circode = (uint)response["circuit_code"];
             theUser.AddSimCircuit(circode, LLUUID.Random());
             response["home"] = "{'region_handle':[r" + (997 * 256).ToString() + ",r" + (996 * 256).ToString() + "], 'position':[r" + theUser.homepos.X.ToString() + ",r" + theUser.homepos.Y.ToString() + ",r" + theUser.homepos.Z.ToString() + "], 'look_at':[r" + theUser.homelookat.X.ToString() + ",r" + theUser.homelookat.Y.ToString() + ",r" + theUser.homelookat.Z.ToString() + "]}";
-            response["sim_port"] = OpenSimRoot.Instance.Cfg.IPListenPort;
-            response["sim_ip"] = OpenSimRoot.Instance.Cfg.IPListenAddr;
+            response["sim_port"] = m_port;
+            response["sim_ip"] = m_ipAddr;
             response["region_y"] = (Int32)996 * 256;
             response["region_x"] = (Int32)997* 256;
 
@@ -67,9 +71,9 @@ namespace OpenSim.UserServer
             _login.InventoryFolder = new LLUUID((string)Inventory1["folder_id"]);
 
             //working on local computer if so lets add to the gridserver's list of sessions?
-            if (OpenSimRoot.Instance.GridServers.GridServer.GetName() == "Local")
+            if (m_gridServer.GetName() == "Local")
             {
-                ((LocalGridBase)this._gridServer).AddNewSession(_login);
+                ((LocalGridBase)this.m_gridServer).AddNewSession(_login);
             }
         }
     }
-- 
cgit v1.1