From a9e9bc83ef5f0d36551eee420da6c71df48ad489 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Wed, 20 Jun 2007 15:52:45 +0000
Subject: * and done the same for OGS..

---
 .../OpenUser.Config/UserConfigDb4o/DbUserConfig.cs | 32 +++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'OpenGridServices/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs')

diff --git a/OpenGridServices/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs b/OpenGridServices/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs
index fe0e7aa..770a6b9 100644
--- a/OpenGridServices/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs
+++ b/OpenGridServices/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs
@@ -37,7 +37,7 @@ namespace OpenUser.Config.UserConfigDb4o
 	{
 		public UserConfig GetConfigObject()
 		{
-			OpenSim.Framework.Console.MainConsole.Instance.Verbose("Loading Db40Config dll");
+			OpenSim.Framework.Console.MainLog.Instance.Verbose("Loading Db40Config dll");
 			return ( new DbUserConfig());
 		}
 	}
@@ -47,13 +47,13 @@ namespace OpenUser.Config.UserConfigDb4o
 		private IObjectContainer db;	
 		
 		public void LoadDefaults() {
-			OpenSim.Framework.Console.MainConsole.Instance.Notice("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
+			OpenSim.Framework.Console.MainLog.Instance.Notice("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
 			
-			this.DefaultStartupMsg = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Default startup message", "Welcome to OGS");
+			this.DefaultStartupMsg = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default startup message", "Welcome to OGS");
 
-			this.GridServerURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid server URL","http://127.0.0.1:8001/");
-            		this.GridSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to grid server","null");
-            		this.GridRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from grid server","null");
+			this.GridServerURL = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid server URL","http://127.0.0.1:8001/");
+            		this.GridSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to grid server","null");
+            		this.GridRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from grid server","null");
 		}
 
 		public override void InitConfig() {
@@ -61,7 +61,7 @@ namespace OpenUser.Config.UserConfigDb4o
 				db = Db4oFactory.OpenFile("openuser.yap");
 				IObjectSet result = db.Get(typeof(DbUserConfig));
 				if(result.Count==1) {
-					OpenSim.Framework.Console.MainConsole.Instance.Verbose("Config.cs:InitConfig() - Found a UserConfig object in the local database, loading");
+					OpenSim.Framework.Console.MainLog.Instance.Verbose("Config.cs:InitConfig() - Found a UserConfig object in the local database, loading");
 					foreach (DbUserConfig cfg in result) {
 						this.GridServerURL=cfg.GridServerURL;
 						this.GridSendKey=cfg.GridSendKey;
@@ -69,22 +69,22 @@ namespace OpenUser.Config.UserConfigDb4o
 						this.DefaultStartupMsg=cfg.DefaultStartupMsg;
 					}
 				} else {
-					OpenSim.Framework.Console.MainConsole.Instance.Verbose("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
+					OpenSim.Framework.Console.MainLog.Instance.Verbose("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
 					LoadDefaults();
-					OpenSim.Framework.Console.MainConsole.Instance.Verbose("Writing out default settings to local database");
+					OpenSim.Framework.Console.MainLog.Instance.Verbose("Writing out default settings to local database");
 					db.Set(this);
 					db.Close();
 				}
 			} catch(Exception e) {
-				OpenSim.Framework.Console.MainConsole.Instance.Warn("Config.cs:InitConfig() - Exception occured");
-                OpenSim.Framework.Console.MainConsole.Instance.Warn(e.ToString());
+				OpenSim.Framework.Console.MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");
+                OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());
 			}
 			
-			OpenSim.Framework.Console.MainConsole.Instance.Verbose("User settings loaded:");
-			OpenSim.Framework.Console.MainConsole.Instance.Verbose("Default startup message: " + this.DefaultStartupMsg);
-			OpenSim.Framework.Console.MainConsole.Instance.Verbose("Grid server URL: " + this.GridServerURL);
-			OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to send to grid: " + this.GridSendKey);
-			OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to expect from grid: " + this.GridRecvKey);
+			OpenSim.Framework.Console.MainLog.Instance.Verbose("User settings loaded:");
+			OpenSim.Framework.Console.MainLog.Instance.Verbose("Default startup message: " + this.DefaultStartupMsg);
+			OpenSim.Framework.Console.MainLog.Instance.Verbose("Grid server URL: " + this.GridServerURL);
+			OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to send to grid: " + this.GridSendKey);
+			OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to expect from grid: " + this.GridRecvKey);
 		}
 	
 
-- 
cgit v1.1