9 files changed, 49 insertions, 44 deletions

diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 17829b2..9dbd50e 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -72,7 +72,7 @@ namespace OpenSim.Framework.Communications.Cache
         /// </summary>
         public AssetCache(IAssetServer assetServer)
         {
-            System.Console.WriteLine("Creating Asset cache");
+            OpenSim.Framework.Console.MainLog.Instance.Verbose("ASSETSTORAGE","Creating Asset cache");
             _assetServer = assetServer;
             _assetServer.SetReceiver(this);
             Assets = new Dictionary<LLUUID, AssetInfo>();
@@ -89,7 +89,7 @@ namespace OpenSim.Framework.Communications.Cache
 
         public AssetCache(string assetServerDLLName, string assetServerURL, string assetServerKey)
         {
-            System.Console.WriteLine("Creating Asset cache");
+            OpenSim.Framework.Console.MainLog.Instance.Verbose("ASSETSTORAGE", "Creating Asset cache");
             _assetServer = this.LoadAssetDll(assetServerDLLName);
 
 
diff --git a/OpenSim/Framework/Communications/Cache/AssetServer.cs b/OpenSim/Framework/Communications/Cache/AssetServer.cs
index 22bdc5c..aebda00 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServer.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServer.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Framework.Communications.Cache
             yapfile = File.Exists(Path.Combine(Util.dataDir(), "regionassets.yap"));
 
             db = Db4oFactory.OpenFile(Path.Combine(Util.dataDir(), "regionassets.yap"));
-            MainLog.Instance.Verbose("Db4 Asset database  creation");
+            MainLog.Instance.Verbose("ASSETS","Db4 Asset database  creation");
 
             if (!yapfile)
             {
@@ -75,7 +75,7 @@ namespace OpenSim.Framework.Communications.Cache
 
             if (db != null)
             {
-                MainLog.Instance.Verbose("Closing local asset server database");
+                MainLog.Instance.Verbose("ASSETSERVER","Closing local asset server database");
                 db.Close();
             }
         }
diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
index 08d5b87..685c0b9 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
@@ -36,8 +36,8 @@ namespace OpenSim.Framework.Communications.Cache
 
 
         public AssetServerBase()
-        {
-            System.Console.WriteLine("Starting Db4o asset storage system");            
+        {

+            OpenSim.Framework.Console.MainLog.Instance.Verbose("ASSETSERVER","Starting Db4o asset storage system");
             this._assetRequests = new BlockingQueue<ARequest>();
 
             this._localAssetServerThread = new Thread( RunRequests );
diff --git a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
index 69f83d2..580e5c4 100644
--- a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
+++ b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Framework.Communications.Cache
                         m_assetProviderPlugin = plug;
                         m_assetProviderPlugin.Initialise();
 
-                        MainLog.Instance.Verbose("AssetStorage: Added " + m_assetProviderPlugin.Name + " " + m_assetProviderPlugin.Version);
+                        MainLog.Instance.Verbose("AssetStorage","Added " + m_assetProviderPlugin.Name + " " + m_assetProviderPlugin.Version);
                     }
 
                     typeInterface = null;
@@ -92,7 +92,7 @@ namespace OpenSim.Framework.Communications.Cache
             {
                 ARequest req = this._assetRequests.Dequeue();
 
-                MainLog.Instance.Verbose("Requesting asset: " + req.AssetID);
+                MainLog.Instance.Verbose("AssetStorage","Requesting asset: " + req.AssetID);
 
                 AssetBase asset = null;
                 lock (syncLock)
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
index 65eb509..06a1ca8 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Framework.Communications
                                 (IInventoryData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
                             plug.Initialise();
                             this.m_plugins.Add(plug.getName(), plug);
-                            MainLog.Instance.Verbose("Inventorystorage: Added IInventoryData Interface");
+                            MainLog.Instance.Verbose("INVENTORY","Added IInventoryData Interface");
                         }
                     }
                 }
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index 674c746..f4648df 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Framework.UserManagement
         public XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request)
         {
 
-            MainLog.Instance.Verbose("Attempting login now...");
+            MainLog.Instance.Verbose("LOGIN","Attempting login now...");
             XmlRpcResponse response = new XmlRpcResponse();
             Hashtable requestData = (Hashtable)request.Params[0];
 
diff --git a/OpenSim/Framework/Console/LogBase.cs b/OpenSim/Framework/Console/LogBase.cs
index 5a7ce4d..246afa1 100644
--- a/OpenSim/Framework/Console/LogBase.cs
+++ b/OpenSim/Framework/Console/LogBase.cs
@@ -170,8 +170,11 @@ namespace OpenSim.Framework.Console
         /// <param name="args">WriteLine-style message arguments</param>
         public void Verbose(string format, params object[] args)
         {
-            WriteNewLine(ConsoleColor.Gray, format, args);
-            return;
+            if (!m_silent)
+            {
+                WriteNewLine(ConsoleColor.Gray, format, args);
+                return;
+            }
         }
 
         /// <summary>
@@ -182,9 +185,12 @@ namespace OpenSim.Framework.Console
         /// <param name="args">WriteLine-style message arguments</param>
         public void Verbose(string sender, string format, params object[] args)
         {
-            WritePrefixLine(DeriveColor(sender), sender);
-            WriteNewLine(ConsoleColor.Gray, format, args);
-            return;
+            if (!m_silent)
+            {
+                WritePrefixLine(DeriveColor(sender), sender);
+                WriteNewLine(ConsoleColor.Gray, format, args);
+                return;
+            }
         }
 
         /// <summary>
@@ -234,22 +240,20 @@ namespace OpenSim.Framework.Console
                 Log.Write(now);
                 Log.WriteLine(format, args);
                 Log.Flush();
-                if (!m_silent)
+
+                System.Console.Write(now);
+                try
                 {
-                    System.Console.Write(now);
-                    try
-                    {
-                        if (color != ConsoleColor.White)
-                            System.Console.ForegroundColor = color;
+                    if (color != ConsoleColor.White)
+                        System.Console.ForegroundColor = color;
 
-                        System.Console.WriteLine(format, args);
-                        System.Console.ResetColor();
-                    }
-                    catch (ArgumentNullException)
-                    {
-                        // Some older systems dont support coloured text.
-                        System.Console.WriteLine(format, args);
-                    }
+                    System.Console.WriteLine(format, args);
+                    System.Console.ResetColor();
+                }
+                catch (ArgumentNullException)
+                {
+                    // Some older systems dont support coloured text.
+                    System.Console.WriteLine(format, args);
                 }
                 return;
             }
@@ -265,19 +269,16 @@ namespace OpenSim.Framework.Console
 
                 System.Console.Write("[");
 
-                if (!m_silent)
+                try
                 {
-                    try
-                    {
-                        System.Console.ForegroundColor = color;
-                        System.Console.Write(sender);
-                        System.Console.ResetColor();
-                    }
-                    catch (ArgumentNullException)
-                    {
-                        // Some older systems dont support coloured text.
-                        System.Console.WriteLine(sender);
-                    }
+                    System.Console.ForegroundColor = color;
+                    System.Console.Write(sender);
+                    System.Console.ResetColor();
+                }
+                catch (ArgumentNullException)
+                {
+                    // Some older systems dont support coloured text.
+                    System.Console.WriteLine(sender);
                 }
 
                 System.Console.Write("] \t");
diff --git a/OpenSim/Framework/General/Types/EstateSettings.cs b/OpenSim/Framework/General/Types/EstateSettings.cs
index abdcf6f..2675e52 100644
--- a/OpenSim/Framework/General/Types/EstateSettings.cs
+++ b/OpenSim/Framework/General/Types/EstateSettings.cs
@@ -557,8 +557,12 @@ namespace OpenSim.Framework.Types
         private ConfigurationMember configMember;
         public EstateSettings()
         {
-            configMember = new ConfigurationMember(Path.Combine(Util.configDir(),"estate_settings.xml"), "ESTATE SETTINGS", this.loadConfigurationOptions, this.handleIncomingConfiguration);
-            configMember.performConfigurationRetrieve();
+            // Temporary hack to prevent multiple loadings.
+            if (configMember == null)
+            {
+                configMember = new ConfigurationMember(Path.Combine(Util.configDir(), "estate_settings.xml"), "ESTATE SETTINGS", this.loadConfigurationOptions, this.handleIncomingConfiguration);
+                configMember.performConfigurationRetrieve();
+            }
         }
 
         public void loadConfigurationOptions()
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index 6d432fd..179a651 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -224,7 +224,7 @@ namespace OpenSim.Framework.Servers
         {
             try
             {
-                MainLog.Instance.Status("HTTPD", "Spawned main thread OK");
+                MainLog.Instance.Verbose("HTTPD", "Spawned main thread OK");
                 m_httpListener = new HttpListener();
 
                 m_httpListener.Prefixes.Add("http://+:" + m_port + "/");