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/Server | |
| 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_OLD-eb9458fd7e3a9098712f501cdcf05d71f741ec14.zip opensim-SC_OLD-eb9458fd7e3a9098712f501cdcf05d71f741ec14.tar.gz opensim-SC_OLD-eb9458fd7e3a9098712f501cdcf05d71f741ec14.tar.bz2 opensim-SC_OLD-eb9458fd7e3a9098712f501cdcf05d71f741ec14.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
Diffstat (limited to 'OpenSim/Server')
| -rw-r--r-- | OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs b/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs index d85aab0..346af32 100644 --- a/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs +++ b/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs | |||
| @@ -177,7 +177,8 @@ namespace OpenSim.Server.Handlers.Grid | |||
| 177 | map[k] = OSD.FromString(_info[k].ToString()); | 177 | map[k] = OSD.FromString(_info[k].ToString()); |
| 178 | } | 178 | } |
| 179 | 179 | ||
| 180 | string HomeURI = Util.GetConfigVarFromSections<string>(m_Config, "HomeURI", new string[] {"Startup"}); | 180 | string HomeURI = Util.GetConfigVarFromSections<string>(m_Config, "HomeURI", |
| 181 | new string[] { "Startup", "Hypergrid" }, String.Empty); | ||
| 181 | 182 | ||
| 182 | if (!String.IsNullOrEmpty(HomeURI)) | 183 | if (!String.IsNullOrEmpty(HomeURI)) |
| 183 | map["home"] = OSD.FromString(HomeURI); | 184 | map["home"] = OSD.FromString(HomeURI); |