aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.RegionServer/UserServer/LocalUserProfileManager.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim.RegionServer/UserServer/LocalUserProfileManager.cs')
-rw-r--r--OpenSim.RegionServer/UserServer/LocalUserProfileManager.cs18
1 files changed, 7 insertions, 11 deletions
diff --git a/OpenSim.RegionServer/UserServer/LocalUserProfileManager.cs b/OpenSim.RegionServer/UserServer/LocalUserProfileManager.cs
index eee1c3a..83e340b 100644
--- a/OpenSim.RegionServer/UserServer/LocalUserProfileManager.cs
+++ b/OpenSim.RegionServer/UserServer/LocalUserProfileManager.cs
@@ -12,15 +12,11 @@ namespace OpenSim.UserServer
12{ 12{
13 class LocalUserProfileManager : UserProfileManager 13 class LocalUserProfileManager : UserProfileManager
14 { 14 {
15 private IGridServer m_gridServer; 15 private IGridServer _gridServer;
16 private int m_port;
17 private string m_ipAddr;
18 16
19 public LocalUserProfileManager(IGridServer gridServer, int simPort, string ipAddr) 17 public LocalUserProfileManager(IGridServer gridServer)
20 { 18 {
21 m_gridServer = gridServer; 19 _gridServer = gridServer;
22 m_port = simPort;
23 m_ipAddr = ipAddr;
24 } 20 }
25 21
26 public override void InitUserProfiles() 22 public override void InitUserProfiles()
@@ -33,8 +29,8 @@ namespace OpenSim.UserServer
33 uint circode = (uint)response["circuit_code"]; 29 uint circode = (uint)response["circuit_code"];
34 theUser.AddSimCircuit(circode, LLUUID.Random()); 30 theUser.AddSimCircuit(circode, LLUUID.Random());
35 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() + "]}"; 31 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() + "]}";
36 response["sim_port"] = m_port; 32 response["sim_port"] = OpenSimRoot.Instance.Cfg.IPListenPort;
37 response["sim_ip"] = m_ipAddr; 33 response["sim_ip"] = OpenSimRoot.Instance.Cfg.IPListenAddr;
38 response["region_y"] = (Int32)996 * 256; 34 response["region_y"] = (Int32)996 * 256;
39 response["region_x"] = (Int32)997* 256; 35 response["region_x"] = (Int32)997* 256;
40 36
@@ -71,9 +67,9 @@ namespace OpenSim.UserServer
71 _login.InventoryFolder = new LLUUID((string)Inventory1["folder_id"]); 67 _login.InventoryFolder = new LLUUID((string)Inventory1["folder_id"]);
72 68
73 //working on local computer if so lets add to the gridserver's list of sessions? 69 //working on local computer if so lets add to the gridserver's list of sessions?
74 if (m_gridServer.GetName() == "Local") 70 if (OpenSimRoot.Instance.GridServers.GridServer.GetName() == "Local")
75 { 71 {
76 ((LocalGridBase)this.m_gridServer).AddNewSession(_login); 72 ((LocalGridBase)this._gridServer).AddNewSession(_login);
77 } 73 }
78 } 74 }
79 } 75 }