Merge branch 'master' into careminster

Conflicts:
	OpenSim/Framework/Servers/BaseOpenSimServer.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

3 files changed, 12 insertions, 15 deletions

diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs
index 2e6d279..210a314 100644
--- a/OpenSim/Server/Base/ServerUtils.cs
+++ b/OpenSim/Server/Base/ServerUtils.cs
@@ -138,17 +138,17 @@ namespace OpenSim.Server.Base
                 case ExtensionChange.Add:
                     if (a.AddinFile.Contains(Registry.DefaultAddinsFolder))
                     {
-                        m_log.InfoFormat("[SERVER]: Adding {0} from registry", a.Name);
+                        m_log.InfoFormat("[SERVER UTILS]: Adding {0} from registry", a.Name);
                         connector.PluginPath = System.IO.Path.Combine(Registry.DefaultAddinsFolder,a.Name.Replace(',', '.'));                    }
                     else
                     {
-                        m_log.InfoFormat("[SERVER]: Adding {0} from ./bin", a.Name);
+                        m_log.InfoFormat("[SERVER UTILS]: Adding {0} from ./bin", a.Name);
                         connector.PluginPath = a.AddinFile;
                     }
                     LoadPlugin(connector);
                     break;
                 case ExtensionChange.Remove:
-                    m_log.InfoFormat("[SERVER]: Removing {0}", a.Name);
+                    m_log.InfoFormat("[SERVER UTILS]: Removing {0}", a.Name);
                     UnloadPlugin(connector);
                     break;
             }
@@ -166,13 +166,13 @@ namespace OpenSim.Server.Base
             }
             else
             {
-                m_log.InfoFormat("[SERVER]: {0} Disabled.", connector.ConfigName);
+                m_log.InfoFormat("[SERVER UTILS]: {0} Disabled.", connector.ConfigName);
             }
         }
 
         private void UnloadPlugin(IRobustConnector connector)
         {
-            m_log.InfoFormat("[Server]: Unloading {0}", connector.ConfigName);
+            m_log.InfoFormat("[SERVER UTILS]: Unloading {0}", connector.ConfigName);
 
             connector.Unload();
         }
@@ -280,7 +280,7 @@ namespace OpenSim.Server.Base
                             {
                                 if (!(e is System.MissingMethodException))
                                 {
-                                    m_log.ErrorFormat("Error loading plugin {0} from {1}. Exception: {2}, {3}",
+                                    m_log.ErrorFormat("[SERVER UTILS]: Error loading plugin {0} from {1}. Exception: {2}, {3}",
                                         interfaceName, 
                                         dllName, 
                                         e.InnerException == null ? e.Message : e.InnerException.Message, 
@@ -298,14 +298,14 @@ namespace OpenSim.Server.Base
             }
             catch (ReflectionTypeLoadException rtle)
             {
-                m_log.Error(string.Format("Error loading plugin from {0}:\n{1}", dllName,
+                m_log.Error(string.Format("[SERVER UTILS]: Error loading plugin from {0}:\n{1}", dllName,
                     String.Join("\n", Array.ConvertAll(rtle.LoaderExceptions, e => e.ToString()))),
                     rtle);
                 return null;
             }
             catch (Exception e)
             {
-                m_log.Error(string.Format("Error loading plugin from {0}", dllName), e);
+                m_log.Error(string.Format("[SERVER UTILS]: Error loading plugin from {0}", dllName), e);
                 return null;
             }
         }
@@ -517,7 +517,7 @@ namespace OpenSim.Server.Base
         public static IConfigSource LoadInitialConfig(string url)
         {
             IConfigSource source = new XmlConfigSource();
-            m_log.InfoFormat("[CONFIG]: {0} is a http:// URI, fetching ...", url);
+            m_log.InfoFormat("[SERVER UTILS]: {0} is a http:// URI, fetching ...", url);
 
             // The ini file path is a http URI
             // Try to read it
@@ -529,7 +529,7 @@ namespace OpenSim.Server.Base
             }
             catch (Exception e)
             {
-                m_log.FatalFormat("[CONFIG]: Exception reading config from URI {0}\n" + e.ToString(), url);
+                m_log.FatalFormat("[SERVER UTILS]: Exception reading config from URI {0}\n" + e.ToString(), url);
                 Environment.Exit(1);
             }
 
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index 5aff72a..7c8e6b7 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -186,10 +186,7 @@ namespace OpenSim.Server.Base
                 XmlConfigurator.Configure();
             }
 
-            // FIXME: This should be done down in ServerBase but we need to sort out and refactor the log4net
-            // XmlConfigurator calls first accross servers.
-            m_log.InfoFormat("[SERVER BASE]: Starting in {0}", m_startupDirectory);
-
+            LogEnvironmentInformation();
             RegisterCommonAppenders(startupConfig);
 
             if (startupConfig.GetString("PIDFile", String.Empty) != String.Empty)
diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs
index 8be69a9..65e9287 100644
--- a/OpenSim/Server/ServerMain.cs
+++ b/OpenSim/Server/ServerMain.cs
@@ -145,7 +145,7 @@ namespace OpenSim.Server
                 }
                 else
                 {
-                    m_log.InfoFormat("[SERVER]: Failed to load {0}", conn);
+                    m_log.ErrorFormat("[SERVER]: Failed to load {0}", conn);
                 }
             }