* 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)

3 files changed, 11 insertions, 7 deletions

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
diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index 49b8ef9..23b1627 100644
--- a/OpenSim/Framework/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.cs
@@ -34,7 +34,7 @@ namespace OpenSim.Framework
     {
         public static readonly uint DefaultHttpListenerPort = 9000;
         public static uint RemotingListenerPort = 8895;
-        public string AssetSendKey = String.Empty;
+        public string AssetSendKey = String.Empty;        
         public string AssetURL = "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString() + "/";
 
         public string GridRecvKey = String.Empty;
@@ -85,7 +85,7 @@ namespace OpenSim.Framework
             httpSSLPort =
                 (uint)config.Configs["Network"].GetInt("http_listener_sslport", ((int)DefaultHttpListenerPort+1));
             HttpUsesSSL = config.Configs["Network"].GetBoolean("http_listener_ssl", false);
-            HttpSSLCN = config.Configs["Network"].GetString("http_listener_cn", "");
+            HttpSSLCN = config.Configs["Network"].GetString("http_listener_cn", "localhost");
             RemotingListenerPort =
                 (uint) config.Configs["Network"].GetInt("remoting_listener_port", (int) RemotingListenerPort);
             GridURL =
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index 16bfbd8..5bd0fa5 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -115,7 +115,6 @@ namespace OpenSim.Framework.Servers
         {
             string httpMethod = handler.HttpMethod;
             string path = handler.Path;
-
             string handlerKey = GetHandlerKey(httpMethod, path);
 
             lock (m_streamHandlers)
@@ -187,7 +186,6 @@ namespace OpenSim.Framework.Servers
         // Note that the agent string is provided simply to differentiate
         // the handlers - it is NOT required to be an actual agent header
         // value.
-
         public bool AddAgentHandler(string agent, IHttpAgentHandler handler)
         {
             lock (m_agentHandlers)