aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.Servers/LocalUserProfileManager.cs
diff options
context:
space:
mode:
authorMW2007-05-08 16:40:20 +0000
committerMW2007-05-08 16:40:20 +0000
commit26002559c0e8ae52e527a1b034da0b9e5601ea93 (patch)
tree2e6ecff93306140ffce9e609ac7234b26c08dfad /OpenSim.Servers/LocalUserProfileManager.cs
parent* added guid to logname to avoid file sharing on multiple instances on same host (diff)
downloadopensim-SC_OLD-26002559c0e8ae52e527a1b034da0b9e5601ea93.zip
opensim-SC_OLD-26002559c0e8ae52e527a1b034da0b9e5601ea93.tar.gz
opensim-SC_OLD-26002559c0e8ae52e527a1b034da0b9e5601ea93.tar.bz2
opensim-SC_OLD-26002559c0e8ae52e527a1b034da0b9e5601ea93.tar.xz
Fixed bug where client crashes on login if in sandbox mode and region is set to anything other than 997,996
Diffstat (limited to 'OpenSim.Servers/LocalUserProfileManager.cs')
-rw-r--r--OpenSim.Servers/LocalUserProfileManager.cs10
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim.Servers/LocalUserProfileManager.cs b/OpenSim.Servers/LocalUserProfileManager.cs
index 989af22..2a119c5 100644
--- a/OpenSim.Servers/LocalUserProfileManager.cs
+++ b/OpenSim.Servers/LocalUserProfileManager.cs
@@ -43,12 +43,16 @@ namespace OpenSim.UserServer
43 private IGridServer m_gridServer; 43 private IGridServer m_gridServer;
44 private int m_port; 44 private int m_port;
45 private string m_ipAddr; 45 private string m_ipAddr;
46 private uint regionX;
47 private uint regionY;
46 48
47 public LocalUserProfileManager(IGridServer gridServer, int simPort, string ipAddr) 49 public LocalUserProfileManager(IGridServer gridServer, int simPort, string ipAddr , uint regX, uint regY)
48 { 50 {
49 m_gridServer = gridServer; 51 m_gridServer = gridServer;
50 m_port = simPort; 52 m_port = simPort;
51 m_ipAddr = ipAddr; 53 m_ipAddr = ipAddr;
54 regionX = regX;
55 regionY = regY;
52 } 56 }
53 57
54 public override void InitUserProfiles() 58 public override void InitUserProfiles()
@@ -63,8 +67,8 @@ namespace OpenSim.UserServer
63 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() + "]}"; 67 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() + "]}";
64 response["sim_port"] = m_port; 68 response["sim_port"] = m_port;
65 response["sim_ip"] = m_ipAddr; 69 response["sim_ip"] = m_ipAddr;
66 response["region_y"] = (Int32)996 * 256; 70 response["region_y"] = (Int32)regionY* 256;
67 response["region_x"] = (Int32)997* 256; 71 response["region_x"] = (Int32)regionX* 256;
68 72
69 string first; 73 string first;
70 string last; 74 string last;