*Removed GridInfo class as it has been previously replaced with the much better NetworkServersInfo class

*Got the GridServer in OGS1 to go through with registering the region, but the actual storage of the region isnt working right now.
**After this is fixed, grid mode should work!

2 files changed, 3 insertions, 8 deletions

diff --git a/OpenSim/Framework/Communications/IGridServices.cs b/OpenSim/Framework/Communications/IGridServices.cs
index c168c20..c296209 100644
--- a/OpenSim/Framework/Communications/IGridServices.cs
+++ b/OpenSim/Framework/Communications/IGridServices.cs
@@ -31,16 +31,11 @@ using OpenSim.Framework.Types;
 

 namespace OpenSim.Framework.Communications

 {

-    public class GridInfo

-    {

-        public string GridServerURI = "http://grid.deepgrid.com:8001/"; // Temporarily hardcoded.

-        public string GridServerSendKey = "badger";

-        public string GridServerRecvKey = "badger";

-    }

+    

 

     public interface IGridServices

     {

-        RegionCommsListener RegisterRegion(RegionInfo regionInfo, GridInfo gridInfo);

+        RegionCommsListener RegisterRegion(RegionInfo regionInfos);

         List<RegionInfo> RequestNeighbours(RegionInfo regionInfo);

         RegionInfo RequestNeighbourInfo(ulong regionHandle);

         List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY);

diff --git a/OpenSim/Framework/General/Types/NetworkServersInfo.cs b/OpenSim/Framework/General/Types/NetworkServersInfo.cs
index 89ebf94..142edc0 100644
--- a/OpenSim/Framework/General/Types/NetworkServersInfo.cs
+++ b/OpenSim/Framework/General/Types/NetworkServersInfo.cs
@@ -121,7 +121,7 @@ namespace OpenSim.Framework.Types
                     attri = configData.GetAttribute("GridServerURL");

                     if (attri == "")

                     {

-                        this.GridURL = MainLog.Instance.CmdPrompt("Grid server URL", "http://127.0.0.1:8001/");

+                        this.GridURL = MainLog.Instance.CmdPrompt("Grid server URL", "http://127.0.0.1:13801/");

                         configData.SetAttribute("GridServerURL", this.GridURL);

                     }

                     else