Merge branch 'master' into newmultiattach

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs

1 files changed, 1 insertions, 4 deletions

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)