1 files changed, 6 insertions, 21 deletions

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/GridInfoServiceInConnectorModule.cs
index b12d778..6d975af 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/GridInfoServiceInConnectorModule.cs
@@ -38,35 +38,29 @@ using OpenSim.Server.Base;
 using OpenSim.Server.Handlers.Base;
 using OpenSim.Server.Handlers.Grid;
 using OpenSim.Services.Interfaces;
-using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid
 {
-    public class HypergridServiceInConnectorModule : ISharedRegionModule
+    public class GridInfoServiceInConnectorModule : ISharedRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private static bool m_Enabled = false;
         
         private IConfigSource m_Config;
         bool m_Registered = false;
-        HypergridServiceInConnector m_HypergridHandler;
 
         #region IRegionModule interface
 
         public void Initialise(IConfigSource config)
         {
-            //// This module is only on for standalones in hypergrid mode
-            //enabled = (!config.Configs["Startup"].GetBoolean("gridmode", true)) &&
-            //    config.Configs["Startup"].GetBoolean("hypergrid", true);
-            //m_log.DebugFormat("[RegionInventoryService]: enabled? {0}", enabled);
             m_Config = config;
             IConfig moduleConfig = config.Configs["Modules"];
             if (moduleConfig != null)
             {
-                m_Enabled = moduleConfig.GetBoolean("HypergridServiceInConnector", false);
+                m_Enabled = moduleConfig.GetBoolean("GridInfoServiceInConnector", false);
                 if (m_Enabled)
                 {
-                    m_log.Info("[HGGRID IN CONNECTOR]: Hypergrid Service In Connector enabled");
+                    m_log.Info("[GRIDINFO IN CONNECTOR]: GridInfo Service In Connector enabled");
                 }
 
             }
@@ -88,23 +82,19 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid
 
         public string Name
         {
-            get { return "HypergridService"; }
+            get { return "GridInfoService"; }
         }
 
         public void AddRegion(Scene scene)
         {
             if (!m_Enabled)
                 return;
-
         }
 
         public void RemoveRegion(Scene scene)
         {
             if (!m_Enabled)
                 return;
-
-            GridRegion rinfo = new GridRegion(scene.RegionInfo);
-            m_HypergridHandler.RemoveRegion(rinfo);
         }
 
         public void RegionLoaded(Scene scene)
@@ -116,16 +106,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid
             {
                 m_Registered = true;
 
-                m_log.Info("[HypergridService]: Starting...");
-
-//                Object[] args = new Object[] { m_Config, MainServer.Instance };
+                m_log.Info("[GridInfo]: Starting...");
 
-                m_HypergridHandler = new HypergridServiceInConnector(m_Config, MainServer.Instance, scene.RequestModuleInterface<IHyperlinkService>());
-                //ServerUtils.LoadPlugin<HypergridServiceInConnector>("OpenSim.Server.Handlers.dll:HypergridServiceInConnector", args);
+                new GridInfoServerInConnector(m_Config, MainServer.Instance, "GridInfoService");
             }
 
-            GridRegion rinfo = new GridRegion(scene.RegionInfo);
-            m_HypergridHandler.AddRegion(rinfo);
         }
 
         #endregion