From 631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Wed, 12 Oct 2011 21:51:34 +0100 Subject: Get rid of some traces of the old pre-ROBUST grid architecture config --- OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'OpenSim/Server/Handlers') 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 _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(); } -- cgit v1.1