diff options
Diffstat (limited to 'OpenSim/Server')
-rw-r--r-- | OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs b/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs index 0da9fc1..afe2f27 100644 --- a/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs +++ b/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs | |||
@@ -67,12 +67,9 @@ namespace OpenSim.Server.Handlers.Grid | |||
67 | _info["platform"] = "OpenSim"; | 67 | _info["platform"] = "OpenSim"; |
68 | try | 68 | try |
69 | { | 69 | { |
70 | IConfig startupCfg = configSource.Configs["Startup"]; | ||
71 | IConfig gridCfg = configSource.Configs["GridInfoService"]; | 70 | IConfig gridCfg = configSource.Configs["GridInfoService"]; |
72 | IConfig netCfg = configSource.Configs["Network"]; | 71 | IConfig netCfg = configSource.Configs["Network"]; |
73 | 72 | ||
74 | bool grid = startupCfg.GetBoolean("gridmode", false); | ||
75 | |||
76 | if (null != gridCfg) | 73 | if (null != gridCfg) |
77 | { | 74 | { |
78 | foreach (string k in gridCfg.GetKeys()) | 75 | foreach (string k in gridCfg.GetKeys()) |
@@ -82,16 +79,11 @@ namespace OpenSim.Server.Handlers.Grid | |||
82 | } | 79 | } |
83 | else if (null != netCfg) | 80 | else if (null != netCfg) |
84 | { | 81 | { |
85 | if (grid) | 82 | _info["login"] |
86 | _info["login"] | 83 | = String.Format( |
87 | = netCfg.GetString( | 84 | "http://127.0.0.1:{0}/", |
88 | "user_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString()); | 85 | netCfg.GetString( |
89 | else | 86 | "http_listener_port", ConfigSettings.DefaultRegionHttpPort.ToString())); |
90 | _info["login"] | ||
91 | = String.Format( | ||
92 | "http://127.0.0.1:{0}/", | ||
93 | netCfg.GetString( | ||
94 | "http_listener_port", ConfigSettings.DefaultRegionHttpPort.ToString())); | ||
95 | 87 | ||
96 | IssueWarning(); | 88 | IssueWarning(); |
97 | } | 89 | } |