Gird mode in sugilite should now work in so far as you should be able to login and move between regions in the same instance. Moving to regions in a different instance of opensim still needs implementing (working on it now).

Also trying to look at the map in grid mode will crash the server. 

2 files changed, 12 insertions, 1 deletions

diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index f90e766..109d027 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -31,6 +31,7 @@ using libsecondlife.Packets;
 using OpenSim.Framework.Data;

 using OpenSim.Framework.Interfaces;

 using OpenSim.Framework.Types;

+using OpenSim.Framework.Servers;

 

 namespace OpenSim.Framework.Communications

 {

@@ -42,7 +43,7 @@ namespace OpenSim.Framework.Communications
         public IInterRegionCommunications InterRegion;

 

         public NetworkServersInfo ServersInfo;

-        public CommunicationsManager(NetworkServersInfo serversInfo)

+        public CommunicationsManager(NetworkServersInfo serversInfo, BaseHttpServer httpServer)

         {

             ServersInfo = serversInfo;

         }

diff --git a/OpenSim/Framework/Data/SimProfileData.cs b/OpenSim/Framework/Data/SimProfileData.cs
index 9db8574..b920cab 100644
--- a/OpenSim/Framework/Data/SimProfileData.cs
+++ b/OpenSim/Framework/Data/SimProfileData.cs
@@ -80,6 +80,10 @@ namespace OpenSim.Framework.Data
         public uint serverPort;

         public string serverURI = "";

 

+        public uint httpPort;

+        public uint remotingPort;

+        public string httpServerURI = "";

+

         /// <summary>

         /// Set of optional overrides. Can be used to create non-eulicidean spaces.

         /// </summary>

@@ -143,7 +147,10 @@ namespace OpenSim.Framework.Data
             simData.regionHandle = Helpers.UIntsToLong((simData.regionLocX * 256), (simData.regionLocY * 256));

             simData.serverIP = (string)responseData["sim_ip"];

             simData.serverPort = Convert.ToUInt32((string)responseData["sim_port"]);

+            simData.httpPort = Convert.ToUInt32((string)responseData["http_port"]);

+            simData.remotingPort = Convert.ToUInt32((string)responseData["remoting_port"]);

             simData.serverURI = "http://" + simData.serverIP + ":" + simData.serverPort.ToString() + "/";

+            simData.httpServerURI = "http://" + simData.serverIP + ":" + simData.httpPort.ToString() + "/";

             simData.UUID = new LLUUID((string)responseData["region_UUID"]);

             simData.regionName = (string)responseData["region_name"];

 

@@ -172,6 +179,9 @@ namespace OpenSim.Framework.Data
             simData.regionHandle = Helpers.UIntsToLong((simData.regionLocX * 256), (simData.regionLocY * 256));

             simData.serverIP = (string)responseData["sim_ip"];

             simData.serverPort = Convert.ToUInt32((string)responseData["sim_port"]);

+            simData.httpPort = Convert.ToUInt32((string)responseData["http_port"]);

+            simData.remotingPort = Convert.ToUInt32((string)responseData["remoting_port"]);

+            simData.httpServerURI = "http://" + simData.serverIP + ":" + simData.httpPort.ToString() + "/";

             simData.serverURI = "http://" + simData.serverIP + ":" + simData.serverPort.ToString() + "/";

             simData.UUID = new LLUUID((string)responseData["region_UUID"]);

             simData.regionName = (string)responseData["region_name"];