aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
authormingchen2007-07-06 20:40:03 +0000
committermingchen2007-07-06 20:40:03 +0000
commitbc02ddf5231d7731af33cc0aa5dc914cbdeb5ee7 (patch)
treec2034371669c04d1130b6ed0d7309855f2860d8d /OpenSim/Grid
parent*Fixed 2 small references to localhost which has some conflicts when resolving. (diff)
downloadopensim-SC_OLD-bc02ddf5231d7731af33cc0aa5dc914cbdeb5ee7.zip
opensim-SC_OLD-bc02ddf5231d7731af33cc0aa5dc914cbdeb5ee7.tar.gz
opensim-SC_OLD-bc02ddf5231d7731af33cc0aa5dc914cbdeb5ee7.tar.bz2
opensim-SC_OLD-bc02ddf5231d7731af33cc0aa5dc914cbdeb5ee7.tar.xz
*Fixed several bugs that crashed the viewer and opensim server when logging in on grid mode
*Note: Grid Mode now works in sugilite, but is still unstable **Known bug in which the grid server crashes after being relaunched from a previously create configuration **Crashing of the viewer crashes the OpenSim server which then crashes the grid server -- needs better handling of exceptions **Multiple sims is still untested, but should connect correctly. Moving between the sims may be a different story
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs4
-rw-r--r--OpenSim/Grid/UserServer/Main.cs4
-rw-r--r--OpenSim/Grid/UserServer/UserManager.cs1
3 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index 422385d..814d7c1 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -400,8 +400,8 @@ namespace OpenSim.Grid.GridServer
400 { 400 {
401 responseData["sim_ip"] = simData.serverIP; 401 responseData["sim_ip"] = simData.serverIP;
402 responseData["sim_port"] = simData.serverPort.ToString(); 402 responseData["sim_port"] = simData.serverPort.ToString();
403 responseData["region_locx"] = simData.regionLocX; 403 responseData["region_locx"] = simData.regionLocX.ToString() ;
404 responseData["region_locy"] = simData.regionLocY; 404 responseData["region_locy"] = simData.regionLocY.ToString();
405 responseData["region_UUID"] = simData.UUID.UUID.ToString(); 405 responseData["region_UUID"] = simData.UUID.UUID.ToString();
406 responseData["region_name"] = simData.regionName; 406 responseData["region_name"] = simData.regionName;
407 } 407 }
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 30465a3..c792918 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -120,8 +120,8 @@ namespace OpenSim.Grid.UserServer
120 string tempfirstname; 120 string tempfirstname;
121 string templastname; 121 string templastname;
122 string tempMD5Passwd; 122 string tempMD5Passwd;
123 uint regX = 997; 123 uint regX = 1000;
124 uint regY = 996; 124 uint regY = 1000;
125 125
126 tempfirstname = m_console.CmdPrompt("First name"); 126 tempfirstname = m_console.CmdPrompt("First name");
127 templastname = m_console.CmdPrompt("Last name"); 127 templastname = m_console.CmdPrompt("Last name");
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index 4216515..7ae7853 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -57,6 +57,7 @@ namespace OpenSim.Grid.UserServer
57 "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}"; 57 "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}";
58 58
59 // Destination 59 // Destination
60 Console.WriteLine("CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + "; Region Y: " + SimInfo.regionLocY);
60 response.SimAddress = SimInfo.serverIP; 61 response.SimAddress = SimInfo.serverIP;
61 response.SimPort = (Int32)SimInfo.serverPort; 62 response.SimPort = (Int32)SimInfo.serverPort;
62 response.RegionX = SimInfo.regionLocX; 63 response.RegionX = SimInfo.regionLocX;