From 34f4738159300ab6370e3db47df5187b6cea8771 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 22 Sep 2009 11:58:40 -0700
Subject: Added HGGridConnector and related code.

---
 .../Grid/LocalGridServiceConnector.cs              | 64 +++++++++++++---------
 1 file changed, 37 insertions(+), 27 deletions(-)

(limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs')

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
index 74ece2e..3f29401 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
@@ -50,6 +50,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 
         private bool m_Enabled = false;
 
+        public LocalGridServicesConnector(IConfigSource source)
+        {
+            InitialiseService(source);
+        }
+
         #region ISharedRegionModule
 
         public Type ReplaceableInterface 
@@ -70,38 +75,43 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
                 string name = moduleConfig.GetString("GridServices", "");
                 if (name == Name)
                 {
-                    IConfig assetConfig = source.Configs["GridService"];
-                    if (assetConfig == null)
-                    {
-                        m_log.Error("[GRID CONNECTOR]: GridService missing from OpenSim.ini");
-                        return;
-                    }
-
-                    string serviceDll = assetConfig.GetString("LocalServiceModule",
-                            String.Empty);
-
-                    if (serviceDll == String.Empty)
-                    {
-                        m_log.Error("[GRID CONNECTOR]: No LocalServiceModule named in section GridService");
-                        return;
-                    }
-
-                    Object[] args = new Object[] { source };
-                    m_GridService =
-                            ServerUtils.LoadPlugin<IGridService>(serviceDll,
-                            args);
-
-                    if (m_GridService == null)
-                    {
-                        m_log.Error("[GRID CONNECTOR]: Can't load asset service");
-                        return;
-                    }
+                    InitialiseService(source);
                     m_Enabled = true;
-                    m_log.Info("[GRID CONNECTOR]: Local grid connector enabled");
+                    m_log.Info("[LOCAL GRID CONNECTOR]: Local grid connector enabled");
                 }
             }
         }
 
+        private void InitialiseService(IConfigSource source)
+        {
+            IConfig assetConfig = source.Configs["GridService"];
+            if (assetConfig == null)
+            {
+                m_log.Error("[LOCAL GRID CONNECTOR]: GridService missing from OpenSim.ini");
+                return;
+            }
+
+            string serviceDll = assetConfig.GetString("LocalServiceModule",
+                    String.Empty);
+
+            if (serviceDll == String.Empty)
+            {
+                m_log.Error("[LOCAL GRID CONNECTOR]: No LocalServiceModule named in section GridService");
+                return;
+            }
+
+            Object[] args = new Object[] { source };
+            m_GridService =
+                    ServerUtils.LoadPlugin<IGridService>(serviceDll,
+                    args);
+
+            if (m_GridService == null)
+            {
+                m_log.Error("[LOCAL GRID CONNECTOR]: Can't load asset service");
+                return;
+            }
+        }
+
         public void PostInitialise()
         {
         }
-- 
cgit v1.1