diff options
| author | Melanie | 2013-02-23 20:37:09 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-23 20:37:09 +0000 |
| commit | e3ea2c4beefb65ba997beab1509aa996a46f7864 (patch) | |
| tree | 778cba450e788b13f4d000c6e49f3d94bd25f65c /OpenSim/Server | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | More clarification on the [Groups] section (diff) | |
| download | opensim-SC-e3ea2c4beefb65ba997beab1509aa996a46f7864.zip opensim-SC-e3ea2c4beefb65ba997beab1509aa996a46f7864.tar.gz opensim-SC-e3ea2c4beefb65ba997beab1509aa996a46f7864.tar.bz2 opensim-SC-e3ea2c4beefb65ba997beab1509aa996a46f7864.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs b/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs index 35f86c5..d85aab0 100644 --- a/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs +++ b/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs | |||
| @@ -177,7 +177,7 @@ 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.GetConfigVarWithDefaultSection(m_Config, "HomeURI", string.Empty); | 180 | string HomeURI = Util.GetConfigVarFromSections<string>(m_Config, "HomeURI", new string[] {"Startup"}); |
| 181 | 181 | ||
| 182 | if (!String.IsNullOrEmpty(HomeURI)) | 182 | if (!String.IsNullOrEmpty(HomeURI)) |
| 183 | map["home"] = OSD.FromString(HomeURI); | 183 | map["home"] = OSD.FromString(HomeURI); |