From 6048dfcd715615c0c90b485a72ebbe2641f16d41 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 18 Jul 2014 22:57:04 +0100
Subject: In grid mode, add SuppressConsoleCommands flag to [GridService] so
 that we can stop misleading grid service only console commands from
 registering.

We need to do this because the simulator initializes and internal copy of the GridService in grid mode for internal purposes
---
 .../ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs         | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut')

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
index d5fca71..38fa890 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
@@ -94,15 +94,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 
         private void InitialiseService(IConfigSource source)
         {
-            IConfig assetConfig = source.Configs["GridService"];
-            if (assetConfig == null)
+            IConfig config = source.Configs["GridService"];
+            if (config == null)
             {
                 m_log.Error("[LOCAL GRID SERVICE CONNECTOR]: GridService missing from OpenSim.ini");
                 return;
             }
 
-            string serviceDll = assetConfig.GetString("LocalServiceModule",
-                    String.Empty);
+            string serviceDll = config.GetString("LocalServiceModule", String.Empty);
 
             if (serviceDll == String.Empty)
             {
-- 
cgit v1.1