removed obsolete Verbose() function

1 files changed, 86 insertions, 78 deletions

diff --git a/OpenSim/Grid/UserServer.Config/DbUserConfig.cs b/OpenSim/Grid/UserServer.Config/DbUserConfig.cs
index 1f93779..748973d 100644
--- a/OpenSim/Grid/UserServer.Config/DbUserConfig.cs
+++ b/OpenSim/Grid/UserServer.Config/DbUserConfig.cs
@@ -1,30 +1,30 @@
 /*
-* Copyright (c) Contributors, http://opensimulator.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
 using System;
 using Db4objects.Db4o;
 using OpenSim.Framework.Configuration;
@@ -33,64 +33,72 @@ using OpenSim.Framework.Interfaces;
 
 namespace OpenUser.Config.UserConfigDb4o
 {
-        public class Db4oConfigPlugin: IUserConfig
-        {
-                public UserConfig GetConfigObject()
-                {
-                        MainLog.Instance.Verbose("Loading Db40Config dll");
-                        return ( new DbUserConfig());
-                }
-        }
+    public class Db4oConfigPlugin: IUserConfig
+    {
+        public UserConfig GetConfigObject()
+        {
+            MainLog.Instance.Verbose("DBUSERCONFIG", "Loading Db40Config dll");
+            return ( new DbUserConfig());
+        }
+    }
         
-        public class DbUserConfig : UserConfig
-        {
-                private IObjectContainer db;    
+    public class DbUserConfig : UserConfig
+    {
+        private IObjectContainer db;    
                 
-                public void LoadDefaults() {
-                        MainLog.Instance.Notice("DbUserConfig.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
+        public void LoadDefaults()
+        {
+            MainLog.Instance.Notice("DbUserConfig.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
                         
-                        this.DefaultStartupMsg = MainLog.Instance.CmdPrompt("Default startup message", "Welcome to OGS");
+            this.DefaultStartupMsg = MainLog.Instance.CmdPrompt("Default startup message", "Welcome to OGS");
 
-                        this.GridServerURL = MainLog.Instance.CmdPrompt("Grid server URL","http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString() + "/");
-                        this.GridSendKey = MainLog.Instance.CmdPrompt("Key to send to grid server","null");
-                        this.GridRecvKey = MainLog.Instance.CmdPrompt("Key to expect from grid server","null");
-                }
+            this.GridServerURL = MainLog.Instance.CmdPrompt("Grid server URL","http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString() + "/");
+            this.GridSendKey = MainLog.Instance.CmdPrompt("Key to send to grid server","null");
+            this.GridRecvKey = MainLog.Instance.CmdPrompt("Key to expect from grid server","null");
+        }
 
-                public override void InitConfig() {
-                        try {
-                                db = Db4oFactory.OpenFile("openuser.yap");
-                                IObjectSet result = db.Get(typeof(DbUserConfig));
-                                if(result.Count==1) {
-                                        MainLog.Instance.Verbose("DbUserConfig.cs:InitConfig() - Found a UserConfig object in the local database, loading");
-                                        foreach (DbUserConfig cfg in result) {
-                                                this.GridServerURL=cfg.GridServerURL;
-                                                this.GridSendKey=cfg.GridSendKey;
-                                                this.GridRecvKey=cfg.GridRecvKey;
-                                                this.DefaultStartupMsg=cfg.DefaultStartupMsg;
-                                        }
-                                } else {
-                                        MainLog.Instance.Verbose("DbUserConfig.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
-                                        LoadDefaults();
-                                        MainLog.Instance.Verbose("Writing out default settings to local database");
-                                        db.Set(this);
-                                        db.Close();
-                                }
-                        } catch(Exception e) {
-                                MainLog.Instance.Warn("DbUserConfig.cs:InitConfig() - Exception occured");
+        public override void InitConfig()
+        {
+            try
+            {
+                db = Db4oFactory.OpenFile("openuser.yap");
+                IObjectSet result = db.Get(typeof(DbUserConfig));
+                if(result.Count==1)
+                {
+                    MainLog.Instance.Verbose("DBUSERCONFIG", "DbUserConfig.cs:InitConfig() - Found a UserConfig object in the local database, loading");
+                    foreach (DbUserConfig cfg in result)
+                    {
+                        this.GridServerURL=cfg.GridServerURL;
+                        this.GridSendKey=cfg.GridSendKey;
+                        this.GridRecvKey=cfg.GridRecvKey;
+                        this.DefaultStartupMsg=cfg.DefaultStartupMsg;
+                    }
+                }
+                else
+                {
+                    MainLog.Instance.Verbose("DBUSERCONFIG", "DbUserConfig.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
+                    LoadDefaults();
+                    MainLog.Instance.Verbose("DBUSERCONFIG", "Writing out default settings to local database");
+                    db.Set(this);
+                    db.Close();
+                }
+            }
+            catch(Exception e)
+            {
+                MainLog.Instance.Warn("DbUserConfig.cs:InitConfig() - Exception occured");
                 MainLog.Instance.Warn(e.ToString());
-                        }
+            }
                         
-                        MainLog.Instance.Verbose("User settings loaded:");
-                        MainLog.Instance.Verbose("Default startup message: " + this.DefaultStartupMsg);
-                        MainLog.Instance.Verbose("Grid server URL: " + this.GridServerURL);
-                        MainLog.Instance.Verbose("Key to send to grid: " + this.GridSendKey);
-                        MainLog.Instance.Verbose("Key to expect from grid: " + this.GridRecvKey);
-                }
-        
-
-                public void Shutdown() {
-                        db.Close();
-                }
-        }
+            MainLog.Instance.Verbose("DBUSERCONFIG", "User settings loaded:");
+            MainLog.Instance.Verbose("DBUSERCONFIG", "Default startup message: " + this.DefaultStartupMsg);
+            MainLog.Instance.Verbose("DBUSERCONFIG", "Grid server URL: " + this.GridServerURL);
+            MainLog.Instance.Verbose("DBUSERCONFIG", "Key to send to grid: " + this.GridSendKey);
+            MainLog.Instance.Verbose("DBUSERCONFIG", "Key to expect from grid: " + this.GridRecvKey);
+        }
         
+        public void Shutdown()
+        {
+            db.Close();
+        }
+    }
 }