aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenUser.Config/UserConfigDb4o/DbUserConfig.cs')
-rw-r--r--OpenUser.Config/UserConfigDb4o/DbUserConfig.cs61
1 files changed, 22 insertions, 39 deletions
diff --git a/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs b/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs
index 1084467..f18e373 100644
--- a/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs
+++ b/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs
@@ -30,54 +30,42 @@ using OpenSim.Framework.Console;
30using OpenSim.Framework.Interfaces; 30using OpenSim.Framework.Interfaces;
31using Db4objects.Db4o; 31using Db4objects.Db4o;
32 32
33namespace OpenGrid.Config.GridConfigDb4o 33namespace OpenUser.Config.UserConfigDb4o
34{ 34{
35 public class Db40ConfigPlugin: IGridConfig 35 public class Db4oConfigPlugin: IUserConfig
36 { 36 {
37 public GridConfig GetConfigObject() 37 public UserConfig GetConfigObject()
38 { 38 {
39 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Loading Db40Config dll"); 39 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Loading Db40Config dll");
40 return ( new DbGridConfig()); 40 return ( new DbUserConfig());
41 } 41 }
42 } 42 }
43 43
44 public class DbGridConfig : GridConfig 44 public class DbUserConfig : UserConfig
45 { 45 {
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("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
50 50
51 this.GridOwner = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid owner [OGS development team]: ", "OGS development team"); 51 this.DefaultStartupMsg = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Default startup message [Welcome to OGS]: ", "Welcome to OGS");
52 52
53 this.DefaultAssetServer = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Default asset server [no default]: "); 53 this.GridServerURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid server URL: ");
54 this.AssetSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to asset server: "); 54 this.GridSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to grid server: ");
55 this.AssetRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from asset server: "); 55 this.GridRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from grid server: ");
56
57 this.DefaultUserServer = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Default user server [no default]: ");
58 this.UserSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to user server: ");
59 this.UserRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from user server: ");
60
61 this.SimSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to sims: ");
62 this.SimRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from sims: ");
63 } 56 }
64 57
65 public override void InitConfig() { 58 public override void InitConfig() {
66 try { 59 try {
67 db = Db4oFactory.OpenFile("opengrid.yap"); 60 db = Db4oFactory.OpenFile("openuser.yap");
68 IObjectSet result = db.Get(typeof(DbGridConfig)); 61 IObjectSet result = db.Get(typeof(DbUserConfig));
69 if(result.Count==1) { 62 if(result.Count==1) {
70 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Config.cs:InitConfig() - Found a GridConfig object in the local database, loading"); 63 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Config.cs:InitConfig() - Found a UserConfig object in the local database, loading");
71 foreach (DbGridConfig cfg in result) { 64 foreach (DbUserConfig cfg in result) {
72 this.GridOwner=cfg.GridOwner; 65 this.GridServerURL=cfg.GridServerURL;
73 this.DefaultAssetServer=cfg.DefaultAssetServer; 66 this.GridSendKey=cfg.GridSendKey;
74 this.AssetSendKey=cfg.AssetSendKey; 67 this.GridRecvKey=cfg.GridRecvKey;
75 this.AssetRecvKey=cfg.AssetRecvKey; 68 this.DefaultStartupMsg=cfg.DefaultStartupMsg;
76 this.DefaultUserServer=cfg.DefaultUserServer;
77 this.UserSendKey=cfg.UserSendKey;
78 this.UserRecvKey=cfg.UserRecvKey;
79 this.SimSendKey=cfg.SimSendKey;
80 this.SimRecvKey=cfg.SimRecvKey;
81 } 69 }
82 } else { 70 } else {
83 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("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
@@ -91,16 +79,11 @@ namespace OpenGrid.Config.GridConfigDb4o
91 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(e.ToString()); 79 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(e.ToString());
92 } 80 }
93 81
94 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Grid settings loaded:"); 82 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("User settings loaded:");
95 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Grid owner: " + this.GridOwner); 83 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Default startup message: " + this.DefaultStartupMsg);
96 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Default asset server: " + this.DefaultAssetServer); 84 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Grid server URL: " + this.GridServerURL);
97 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Key to send to asset server: " + this.AssetSendKey); 85 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Key to send to grid: " + this.GridSendKey);
98 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Key to expect from asset server: " + this.AssetRecvKey); 86 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Key to expect from sims: " + this.GridRecvKey);
99 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Default user server: " + this.DefaultUserServer);
100 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Key to send to user server: " + this.UserSendKey);
101 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Key to expect from user server: " + this.UserRecvKey);
102 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Key to send to sims: " + this.SimSendKey);
103 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Key to expect from sims: " + this.SimRecvKey);
104 } 87 }
105 88
106 89