aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenUser.Config/UserConfigDb4o
diff options
context:
space:
mode:
authorAdam Frisby2007-05-12 15:44:10 +0000
committerAdam Frisby2007-05-12 15:44:10 +0000
commitec1901e4b8bcd1dd8487cd4b5ee48a7c58748f3d (patch)
tree569da9ef2e6e528ea799d8c7e1eac637cdffa889 /OpenUser.Config/UserConfigDb4o
parent93 warnings in the compiler, 93 warnings appear, you fix one up, create two m... (diff)
downloadopensim-SC_OLD-ec1901e4b8bcd1dd8487cd4b5ee48a7c58748f3d.zip
opensim-SC_OLD-ec1901e4b8bcd1dd8487cd4b5ee48a7c58748f3d.tar.gz
opensim-SC_OLD-ec1901e4b8bcd1dd8487cd4b5ee48a7c58748f3d.tar.bz2
opensim-SC_OLD-ec1901e4b8bcd1dd8487cd4b5ee48a7c58748f3d.tar.xz
EXTERM-INATED. (Add warnings produced by WriteLine change have been updated to include Log Priority)
Diffstat (limited to 'OpenUser.Config/UserConfigDb4o')
-rw-r--r--OpenUser.Config/UserConfigDb4o/DbUserConfig.cs24
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs b/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs
index 3fff35d..a281889 100644
--- a/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs
+++ b/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs
@@ -36,7 +36,7 @@ namespace OpenUser.Config.UserConfigDb4o
36 { 36 {
37 public UserConfig GetConfigObject() 37 public UserConfig GetConfigObject()
38 { 38 {
39 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Loading Db40Config dll"); 39 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Loading Db40Config dll");
40 return ( new DbUserConfig()); 40 return ( new DbUserConfig());
41 } 41 }
42 } 42 }
@@ -46,7 +46,7 @@ namespace OpenUser.Config.UserConfigDb4o
46 private IObjectContainer db; 46 private IObjectContainer db;
47 47
48 public void LoadDefaults() { 48 public void LoadDefaults() {
49 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings"); 49 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH,"Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
50 50
51 this.DefaultStartupMsg = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Default startup message", "Welcome to OGS"); 51 this.DefaultStartupMsg = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Default startup message", "Welcome to OGS");
52 52
@@ -60,7 +60,7 @@ namespace OpenUser.Config.UserConfigDb4o
60 db = Db4oFactory.OpenFile("openuser.yap"); 60 db = Db4oFactory.OpenFile("openuser.yap");
61 IObjectSet result = db.Get(typeof(DbUserConfig)); 61 IObjectSet result = db.Get(typeof(DbUserConfig));
62 if(result.Count==1) { 62 if(result.Count==1) {
63 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Config.cs:InitConfig() - Found a UserConfig object in the local database, loading"); 63 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Config.cs:InitConfig() - Found a UserConfig object in the local database, loading");
64 foreach (DbUserConfig cfg in result) { 64 foreach (DbUserConfig cfg in result) {
65 this.GridServerURL=cfg.GridServerURL; 65 this.GridServerURL=cfg.GridServerURL;
66 this.GridSendKey=cfg.GridSendKey; 66 this.GridSendKey=cfg.GridSendKey;
@@ -68,22 +68,22 @@ namespace OpenUser.Config.UserConfigDb4o
68 this.DefaultStartupMsg=cfg.DefaultStartupMsg; 68 this.DefaultStartupMsg=cfg.DefaultStartupMsg;
69 } 69 }
70 } else { 70 } else {
71 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults"); 71 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
72 LoadDefaults(); 72 LoadDefaults();
73 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Writing out default settings to local database"); 73 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Writing out default settings to local database");
74 db.Set(this); 74 db.Set(this);
75 db.Close(); 75 db.Close();
76 } 76 }
77 } catch(Exception e) { 77 } catch(Exception e) {
78 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Config.cs:InitConfig() - Exception occured"); 78 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"Config.cs:InitConfig() - Exception occured");
79 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(e.ToString()); 79 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,e.ToString());
80 } 80 }
81 81
82 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("User settings loaded:"); 82 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"User settings loaded:");
83 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Default startup message: " + this.DefaultStartupMsg); 83 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Default startup message: " + this.DefaultStartupMsg);
84 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Grid server URL: " + this.GridServerURL); 84 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Grid server URL: " + this.GridServerURL);
85 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Key to send to grid: " + this.GridSendKey); 85 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Key to send to grid: " + this.GridSendKey);
86 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Key to expect from grid: " + this.GridRecvKey); 86 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Key to expect from grid: " + this.GridRecvKey);
87 } 87 }
88 88
89 89