diff options
author | Diva Canto | 2013-02-21 17:26:19 -0800 |
---|---|---|
committer | Diva Canto | 2013-02-21 17:26:19 -0800 |
commit | e515cdddec435e97e9ed4722de08ee410e94a7e6 (patch) | |
tree | 0b090dc495ef464e037d4f134f059bce35504d2f /OpenSim/Region/CoreModules/Framework/InventoryAccess | |
parent | BulletSim: add OutOfBounds logic and some position sanity checking (diff) | |
download | opensim-SC_OLD-e515cdddec435e97e9ed4722de08ee410e94a7e6.zip opensim-SC_OLD-e515cdddec435e97e9ed4722de08ee410e94a7e6.tar.gz opensim-SC_OLD-e515cdddec435e97e9ed4722de08ee410e94a7e6.tar.bz2 opensim-SC_OLD-e515cdddec435e97e9ed4722de08ee410e94a7e6.tar.xz |
Simplification of HG configs: HomeURI and GatekeeperURI now are defined as default under [Startup]. They can then be overwritten in the other sections (but probably shouldn't). I kept the existing code for backwards compatibility, so this should not cause any breaks from people's current configurations. But people should move to have these 2 vars under [Startup] -- see OpenSim.ini.example and Robust.HG.ini.example. And yes, both names now end with "URI" for consistency.
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/InventoryAccess')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs index 964efda..c439ea8 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs | |||
@@ -88,12 +88,11 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
88 | IConfig thisModuleConfig = source.Configs["HGInventoryAccessModule"]; | 88 | IConfig thisModuleConfig = source.Configs["HGInventoryAccessModule"]; |
89 | if (thisModuleConfig != null) | 89 | if (thisModuleConfig != null) |
90 | { | 90 | { |
91 | // legacy configuration [obsolete] | 91 | m_HomeURI = Util.GetConfigVarWithDefaultSection(source, "HomeURI", "HGInventoryAccessModule"); |
92 | m_HomeURI = thisModuleConfig.GetString("ProfileServerURI", string.Empty); | ||
93 | // preferred | ||
94 | m_HomeURI = thisModuleConfig.GetString("HomeURI", m_HomeURI); | ||
95 | m_OutboundPermission = thisModuleConfig.GetBoolean("OutboundPermission", true); | 92 | m_OutboundPermission = thisModuleConfig.GetBoolean("OutboundPermission", true); |
96 | m_ThisGatekeeper = thisModuleConfig.GetString("Gatekeeper", string.Empty); | 93 | m_ThisGatekeeper = Util.GetConfigVarWithDefaultSection(source, "GatekeeperURI", "HGInventoryAccessModule"); |
94 | // Legacy. Renove soon! | ||
95 | m_ThisGatekeeper = thisModuleConfig.GetString("Gatekeeper", m_ThisGatekeeper); | ||
97 | m_RestrictInventoryAccessAbroad = thisModuleConfig.GetBoolean("RestrictInventoryAccessAbroad", true); | 96 | m_RestrictInventoryAccessAbroad = thisModuleConfig.GetBoolean("RestrictInventoryAccessAbroad", true); |
98 | } | 97 | } |
99 | else | 98 | else |