From acad0328b2c50d22fe76ebb7c8de2c97c856b42f Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Wed, 11 Mar 2009 18:02:22 +0000 Subject: * Make all coded defaults match settings in OpenSim.ini.example * In most cases, the setting in OpenSim.ini.example is taken as the canonical one since this is the file virtually everyone ends up using * OpenSim will start up with a blank OpenSim.ini, in which case sqlite is the default database (as before) --- OpenSim/Framework/Communications/GridInfoService.cs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'OpenSim/Framework/Communications') diff --git a/OpenSim/Framework/Communications/GridInfoService.cs b/OpenSim/Framework/Communications/GridInfoService.cs index 488ce8e..bb54c1b 100644 --- a/OpenSim/Framework/Communications/GridInfoService.cs +++ b/OpenSim/Framework/Communications/GridInfoService.cs @@ -102,9 +102,15 @@ namespace OpenSim.Framework.Communications else if (null != netCfg) { if (grid) - _info["login"] = netCfg.GetString("user_server_url"); - else - _info["login"] = String.Format("http://127.0.0.1:{0}/", netCfg.GetString("http_listener_port")); + _info["login"] + = netCfg.GetString( + "user_server_url", "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString()); + else + _info["login"] + = String.Format( + "http://127.0.0.1:{0}/", + netCfg.GetString("http_listener_port", NetworkServersInfo.DefaultHttpListenerPort)); + IssueWarning(); } else -- cgit v1.1