diff options
Diffstat (limited to 'OpenSim/Region/CoreModules')
3 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs index 381bb4d..dfcf925 100644 --- a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs | |||
@@ -65,11 +65,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure | |||
65 | 65 | ||
66 | m_ThisGridURL = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", | 66 | m_ThisGridURL = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", |
67 | new string[] { "Startup", "Hypergrid", "Messaging" }, String.Empty); | 67 | new string[] { "Startup", "Hypergrid", "Messaging" }, String.Empty); |
68 | // Legacy. Remove soon! | ||
69 | m_ThisGridURL = config.Configs["Messaging"].GetString("Gatekeeper", m_ThisGridURL); | ||
70 | |||
71 | m_log.DebugFormat("[LURE MODULE]: {0} enabled", Name); | 68 | m_log.DebugFormat("[LURE MODULE]: {0} enabled", Name); |
72 | } | 69 | } |
70 | // Legacy. Remove soon! | ||
71 | //// m_ThisGridURL = config.Configs["Messaging"].GetString("Gatekeeper", m_ThisGridURL); | ||
73 | } | 72 | } |
74 | } | 73 | } |
75 | 74 | ||
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs index 8ebd999..8f6eca6 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs | |||
@@ -104,7 +104,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
104 | m_ThisGatekeeper = Util.GetConfigVarFromSections<string>(source, "GatekeeperURI", | 104 | m_ThisGatekeeper = Util.GetConfigVarFromSections<string>(source, "GatekeeperURI", |
105 | new string[] { "Startup", "Hypergrid", "HGInventoryAccessModule" }, String.Empty); | 105 | new string[] { "Startup", "Hypergrid", "HGInventoryAccessModule" }, String.Empty); |
106 | // Legacy. Remove soon! | 106 | // Legacy. Remove soon! |
107 | m_ThisGatekeeper = thisModuleConfig.GetString("Gatekeeper", m_ThisGatekeeper); | 107 | //// m_ThisGatekeeper = thisModuleConfig.GetString("Gatekeeper", m_ThisGatekeeper); |
108 | 108 | ||
109 | m_OutboundPermission = thisModuleConfig.GetBoolean("OutboundPermission", true); | 109 | m_OutboundPermission = thisModuleConfig.GetBoolean("OutboundPermission", true); |
110 | m_RestrictInventoryAccessAbroad = thisModuleConfig.GetBoolean("RestrictInventoryAccessAbroad", true); | 110 | m_RestrictInventoryAccessAbroad = thisModuleConfig.GetBoolean("RestrictInventoryAccessAbroad", true); |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs index ee17093..0efe99d 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs | |||
@@ -129,7 +129,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
129 | m_ThisGatekeeper = Util.GetConfigVarFromSections<string>(source, "GatekeeperURI", | 129 | m_ThisGatekeeper = Util.GetConfigVarFromSections<string>(source, "GatekeeperURI", |
130 | new string[] { "Startup", "Hypergrid", "GridService" }, String.Empty); | 130 | new string[] { "Startup", "Hypergrid", "GridService" }, String.Empty); |
131 | // Legacy. Remove soon! | 131 | // Legacy. Remove soon! |
132 | m_ThisGatekeeper = gridConfig.GetString("Gatekeeper", m_ThisGatekeeper); | 132 | //// m_ThisGatekeeper = gridConfig.GetString("Gatekeeper", m_ThisGatekeeper); |
133 | 133 | ||
134 | Util.checkServiceURI(m_ThisGatekeeper, out m_ThisGatekeeper); | 134 | Util.checkServiceURI(m_ThisGatekeeper, out m_ThisGatekeeper); |
135 | 135 | ||