aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-07-18 22:57:04 +0100
committerJustin Clark-Casey (justincc)2014-07-18 22:57:04 +0100
commit6048dfcd715615c0c90b485a72ebbe2641f16d41 (patch)
treebabd2cc6e4675b705d59fc390cbb30b6bb83ce83 /OpenSim/Region
parentminor: add method doc to ICommands.HasCommand() (diff)
downloadopensim-SC-6048dfcd715615c0c90b485a72ebbe2641f16d41.zip
opensim-SC-6048dfcd715615c0c90b485a72ebbe2641f16d41.tar.gz
opensim-SC-6048dfcd715615c0c90b485a72ebbe2641f16d41.tar.bz2
opensim-SC-6048dfcd715615c0c90b485a72ebbe2641f16d41.tar.xz
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
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs7
1 files changed, 3 insertions, 4 deletions
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
94 94
95 private void InitialiseService(IConfigSource source) 95 private void InitialiseService(IConfigSource source)
96 { 96 {
97 IConfig assetConfig = source.Configs["GridService"]; 97 IConfig config = source.Configs["GridService"];
98 if (assetConfig == null) 98 if (config == null)
99 { 99 {
100 m_log.Error("[LOCAL GRID SERVICE CONNECTOR]: GridService missing from OpenSim.ini"); 100 m_log.Error("[LOCAL GRID SERVICE CONNECTOR]: GridService missing from OpenSim.ini");
101 return; 101 return;
102 } 102 }
103 103
104 string serviceDll = assetConfig.GetString("LocalServiceModule", 104 string serviceDll = config.GetString("LocalServiceModule", String.Empty);
105 String.Empty);
106 105
107 if (serviceDll == String.Empty) 106 if (serviceDll == String.Empty)
108 { 107 {