Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
	OpenSim/Services/Interfaces/IUserAccountService.cs

1 files changed, 25 insertions, 30 deletions

diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index b70b425..46d68c2 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -102,50 +102,45 @@ namespace OpenSim.Services.GridService
 
         public HypergridLinker(IConfigSource config, GridService gridService, IRegionData db)
         {
-            IConfig modulesConfig = config.Configs["Modules"];
-                        if (modulesConfig == null)
-                                return;
-
-                        if (modulesConfig.GetString("HypergridLinker", "") != "HypergridLinker")
-                                return;
+            IConfig gridConfig = config.Configs["GridService"];
+            if (gridConfig == null)
+                return;
 
-            m_log.DebugFormat("[HYPERGRID LINKER]: Starting with db {0}", db.GetType());
+            if (!gridConfig.GetBoolean("HypergridLinker", false))
+                return;
 
             m_Database = db;
             m_GridService = gridService;
+            m_log.DebugFormat("[HYPERGRID LINKER]: Starting with db {0}", db.GetType());
 
-            IConfig gridConfig = config.Configs["GridService"];
-            if (gridConfig != null)
-            {
-                string assetService = gridConfig.GetString("AssetService", string.Empty);
+            string assetService = gridConfig.GetString("AssetService", string.Empty);
 
-                Object[] args = new Object[] { config };
+            Object[] args = new Object[] { config };
 
-                if (assetService != string.Empty)
-                    m_AssetService = ServerUtils.LoadPlugin<IAssetService>(assetService, args);
+            if (assetService != string.Empty)
+                m_AssetService = ServerUtils.LoadPlugin<IAssetService>(assetService, args);
 
-                string scope = gridConfig.GetString("ScopeID", string.Empty);
-                if (scope != string.Empty)
-                    UUID.TryParse(scope, out m_ScopeID);
+            string scope = gridConfig.GetString("ScopeID", string.Empty);
+            if (scope != string.Empty)
+                UUID.TryParse(scope, out m_ScopeID);
 
 //                m_Check4096 = gridConfig.GetBoolean("Check4096", true);
 
-                m_MapTileDirectory = gridConfig.GetString("MapTileDirectory", "maptiles");
+            m_MapTileDirectory = gridConfig.GetString("MapTileDirectory", "maptiles");
 
-                m_ThisGatekeeper = gridConfig.GetString("Gatekeeper", string.Empty);
-                try
-                {
-                    m_ThisGatekeeperURI = new Uri(m_ThisGatekeeper);
-                }
-                catch
-                {
-                    m_log.WarnFormat("[HYPERGRID LINKER]: Malformed URL in [GridService], variable Gatekeeper = {0}", m_ThisGatekeeper);
-                }
+            m_ThisGatekeeper = gridConfig.GetString("Gatekeeper", string.Empty);
+            try
+            {
+                m_ThisGatekeeperURI = new Uri(m_ThisGatekeeper);
+            }
+            catch
+            {
+                m_log.WarnFormat("[HYPERGRID LINKER]: Malformed URL in [GridService], variable Gatekeeper = {0}", m_ThisGatekeeper);
+            }
 
-                m_GatekeeperConnector = new GatekeeperServiceConnector(m_AssetService);
+            m_GatekeeperConnector = new GatekeeperServiceConnector(m_AssetService);
 
-                m_log.Debug("[HYPERGRID LINKER]: Loaded all services...");
-            }
+            m_log.Debug("[HYPERGRID LINKER]: Loaded all services...");
 
             if (!string.IsNullOrEmpty(m_MapTileDirectory))
             {