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/Addons | |
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/Addons')
-rw-r--r-- | OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs b/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs index 92dd85c..0e71c72 100644 --- a/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs +++ b/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs | |||
@@ -65,14 +65,14 @@ namespace OpenSim.Groups | |||
65 | 65 | ||
66 | m_log.DebugFormat("[Groups.RobustHGConnector]: Starting with config name {0}", m_ConfigName); | 66 | m_log.DebugFormat("[Groups.RobustHGConnector]: Starting with config name {0}", m_ConfigName); |
67 | 67 | ||
68 | string homeURI = Util.GetConfigVarWithDefaultSection(config, "HomeURI", m_ConfigName); //cnf.GetString("HomeURI", string.Empty); | ||
69 | if (homeURI == string.Empty) | ||
70 | throw new Exception(String.Format("[Groups.RobustHGConnector]: please provide the HomeURI [Startup] or in section {0}", m_ConfigName)); | ||
71 | |||
68 | IConfig cnf = config.Configs[m_ConfigName]; | 72 | IConfig cnf = config.Configs[m_ConfigName]; |
69 | if (cnf == null) | 73 | if (cnf == null) |
70 | throw new Exception(String.Format("[Groups.RobustHGConnector]: {0} section does not exist", m_ConfigName)); | 74 | throw new Exception(String.Format("[Groups.RobustHGConnector]: {0} section does not exist", m_ConfigName)); |
71 | 75 | ||
72 | string homeURI = cnf.GetString("HomeURI", string.Empty); | ||
73 | if (homeURI == string.Empty) | ||
74 | throw new Exception(String.Format("[Groups.RobustHGConnector]: please provide the HomeURI in section {0}", m_ConfigName)); | ||
75 | |||
76 | if (im == null) | 76 | if (im == null) |
77 | { | 77 | { |
78 | string imDll = cnf.GetString("OfflineIMService", string.Empty); | 78 | string imDll = cnf.GetString("OfflineIMService", string.Empty); |