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/Services/HypergridService/HGSuitcaseInventoryService.cs | |
parent | BulletSim: add OutOfBounds logic and some position sanity checking (diff) | |
download | opensim-SC-e515cdddec435e97e9ed4722de08ee410e94a7e6.zip opensim-SC-e515cdddec435e97e9ed4722de08ee410e94a7e6.tar.gz opensim-SC-e515cdddec435e97e9ed4722de08ee410e94a7e6.tar.bz2 opensim-SC-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 '')
-rw-r--r-- | OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs index 784f136..dd546b8 100644 --- a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs +++ b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs | |||
@@ -96,8 +96,7 @@ namespace OpenSim.Services.HypergridService | |||
96 | if (m_AvatarService == null) | 96 | if (m_AvatarService == null) |
97 | throw new Exception(String.Format("Unable to create m_AvatarService from {0}", avatarDll)); | 97 | throw new Exception(String.Format("Unable to create m_AvatarService from {0}", avatarDll)); |
98 | 98 | ||
99 | // Preferred | 99 | m_HomeURL = Util.GetConfigVarWithDefaultSection(config, "HomeURI", m_ConfigName); |
100 | m_HomeURL = invConfig.GetString("HomeURI", m_HomeURL); | ||
101 | 100 | ||
102 | // m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService); | 101 | // m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService); |
103 | } | 102 | } |