ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 02:36:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1' into bigmerge

Browse Source
This commit is contained in:
Melanie
2011-10-25 01:37:11 +01:00
parent 13d635d1d7 631d5e16ef
commit 9ceb98344a
5 changed files with 6 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs
View File

@@ -67,12 +67,9 @@ namespace OpenSim.Server.Handlers.Grid
_info["platform"] = "OpenSim";
try
{
IConfig startupCfg = configSource.Configs["Startup"];
IConfig gridCfg = configSource.Configs["GridInfoService"];
IConfig netCfg = configSource.Configs["Network"];
bool grid = startupCfg.GetBoolean("gridmode", false);
if (null != gridCfg)
{
foreach (string k in gridCfg.GetKeys())
@@ -82,16 +79,11 @@ namespace OpenSim.Server.Handlers.Grid
}
else if (null != netCfg)
{
if (grid)
_info["login"]
= netCfg.GetString(
"user_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString());
else
_info["login"]
= String.Format(
"http://127.0.0.1:{0}/",
netCfg.GetString(
"http_listener_port", ConfigSettings.DefaultRegionHttpPort.ToString()));
_info["login"]
= String.Format(
"http://127.0.0.1:{0}/",
netCfg.GetString(
"http_listener_port", ConfigSettings.DefaultRegionHttpPort.ToString()));
IssueWarning();
}