diff options
| author | Melanie | 2013-02-28 21:20:07 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-28 21:20:07 +0000 |
| commit | eb9458fd7e3a9098712f501cdcf05d71f741ec14 (patch) | |
| tree | 1a719b0d89f22cefd04866db162694d0eb724d8d /OpenSim/Addons | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fix potential concurrency issue since the LSL notecard cache was not being ch... (diff) | |
| download | opensim-SC-eb9458fd7e3a9098712f501cdcf05d71f741ec14.zip opensim-SC-eb9458fd7e3a9098712f501cdcf05d71f741ec14.tar.gz opensim-SC-eb9458fd7e3a9098712f501cdcf05d71f741ec14.tar.bz2 opensim-SC-eb9458fd7e3a9098712f501cdcf05d71f741ec14.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
Diffstat (limited to 'OpenSim/Addons')
| -rw-r--r-- | OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs b/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs index 7cc9ff4..3584f78 100644 --- a/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs +++ b/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs | |||
| @@ -65,7 +65,8 @@ 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.GetConfigVarFromSections<string>(config, "HomeURI", new string[] { "Startup", m_ConfigName} ); //cnf.GetString("HomeURI", string.Empty); | 68 | string homeURI = Util.GetConfigVarFromSections<string>(config, "HomeURI", |
| 69 | new string[] { "Startup", "Hypergrid", m_ConfigName}, string.Empty); | ||
| 69 | if (homeURI == string.Empty) | 70 | if (homeURI == string.Empty) |
| 70 | throw new Exception(String.Format("[Groups.RobustHGConnector]: please provide the HomeURI [Startup] or in section {0}", m_ConfigName)); | 71 | throw new Exception(String.Format("[Groups.RobustHGConnector]: please provide the HomeURI [Startup] or in section {0}", m_ConfigName)); |
| 71 | 72 | ||