*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

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
             {

                 responseData["sim_ip"] = simData.serverIP;

                 responseData["sim_port"] = simData.serverPort.ToString();

-                responseData["region_locx"] = simData.regionLocX;

-                responseData["region_locy"] = simData.regionLocY;

+                responseData["region_locx"] = simData.regionLocX.ToString() ;

+                responseData["region_locy"] = simData.regionLocY.ToString();

                 responseData["region_UUID"] = simData.UUID.UUID.ToString();

                 responseData["region_name"] = simData.regionName;

             }

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
                     string tempfirstname;

                     string templastname;

                     string tempMD5Passwd;

-                    uint regX = 997;

-                    uint regY = 996;

+                    uint regX = 1000;

+                    uint regY = 1000;

 

                     tempfirstname = m_console.CmdPrompt("First name");

                     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
                 "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}";

 

             // Destination

+            Console.WriteLine("CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + "; Region Y: " + SimInfo.regionLocY);

             response.SimAddress = SimInfo.serverIP;

             response.SimPort = (Int32)SimInfo.serverPort;

             response.RegionX = SimInfo.regionLocX;