Added hg console commands to the module.

Added the IN connector module for link-region and corresponding handler to be used in the regions only. No service as such is needed.
This will replace the current link-region machinery. Compiles but not tested.

1 files changed, 61 insertions, 3 deletions

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
index 22b1015..8526653 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
@@ -30,6 +30,8 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using Nini.Config;
+using OpenMetaverse;
+
 using OpenSim.Framework;
 using OpenSim.Services.Connectors;
 using OpenSim.Region.Framework.Interfaces;
@@ -47,9 +49,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 
         private bool m_Enabled = false;
 
+        private IGridService m_LocalGridService;
+
         public RemoteGridServicesConnector(IConfigSource source)
         {
-            InitialiseService(source);
+            InitialiseServices(source);
         }
 
         #region ISharedRegionmodule
@@ -72,14 +76,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
                 string name = moduleConfig.GetString("GridServices", "");
                 if (name == Name)
                 {
-                    InitialiseService(source);
+                    InitialiseServices(source);
                     m_Enabled = true;
                     m_log.Info("[REMOTE GRID CONNECTOR]: Remote grid enabled");
                 }
             }
         }
 
-        private void InitialiseService(IConfigSource source)
+        private void InitialiseServices(IConfigSource source)
         {
             IConfig gridConfig = source.Configs["GridService"];
             if (gridConfig == null)
@@ -89,6 +93,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             }
 
             base.Initialise(source);
+
+            m_LocalGridService = new LocalGridServicesConnector(source);
         }
 
         public void PostInitialise()
@@ -116,5 +122,57 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
         }
 
         #endregion
+
+        #region IGridService
+
+        public override bool RegisterRegion(UUID scopeID, SimpleRegionInfo regionInfo)
+        {
+            if (m_LocalGridService.RegisterRegion(scopeID, regionInfo))
+                return base.RegisterRegion(scopeID, regionInfo);
+
+            return false;
+        }
+
+        public override bool DeregisterRegion(UUID regionID)
+        {
+            if (m_LocalGridService.DeregisterRegion(regionID))
+                return base.DeregisterRegion(regionID);
+
+            return false;
+        }
+
+        // Let's not override GetNeighbours -- let's get them all from the grid server
+
+        public override SimpleRegionInfo GetRegionByUUID(UUID scopeID, UUID regionID)
+        {
+            SimpleRegionInfo rinfo = m_LocalGridService.GetRegionByUUID(scopeID, regionID);
+            if (rinfo == null)
+                rinfo = base.GetRegionByUUID(scopeID, regionID);
+
+            return rinfo;
+        }
+
+        public override SimpleRegionInfo GetRegionByPosition(UUID scopeID, int x, int y)
+        {
+            SimpleRegionInfo rinfo = m_LocalGridService.GetRegionByPosition(scopeID, x, y);
+            if (rinfo == null)
+                rinfo = base.GetRegionByPosition(scopeID, x, y);
+
+            return rinfo;
+        }
+
+        public override SimpleRegionInfo GetRegionByName(UUID scopeID, string regionName)
+        {
+            SimpleRegionInfo rinfo = m_LocalGridService.GetRegionByName(scopeID, regionName);
+            if (rinfo == null)
+                rinfo = base.GetRegionByName(scopeID, regionName);
+
+            return rinfo;
+        }
+
+        // Let's not override GetRegionsByName -- let's get them all from the grid server
+        // Let's not override GetRegionRange -- let's get them all from the grid server
+
+        #endregion
     }
 }