diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/General/Configuration/GridConfig.cs | 7 | ||||
-rw-r--r-- | OpenSim/Framework/General/Configuration/UserConfig.cs | 7 | ||||
-rw-r--r-- | OpenSim/Grid/GridServer/Main.cs | 2 | ||||
-rw-r--r-- | OpenSim/Grid/UserServer/Main.cs | 2 |
4 files changed, 14 insertions, 4 deletions
diff --git a/OpenSim/Framework/General/Configuration/GridConfig.cs b/OpenSim/Framework/General/Configuration/GridConfig.cs index 0a7f65c..3d07d9b 100644 --- a/OpenSim/Framework/General/Configuration/GridConfig.cs +++ b/OpenSim/Framework/General/Configuration/GridConfig.cs | |||
@@ -17,6 +17,8 @@ namespace OpenSim.Framework.Configuration | |||
17 | 17 | ||
18 | public string SimSendKey = ""; | 18 | public string SimSendKey = ""; |
19 | public string SimRecvKey = ""; | 19 | public string SimRecvKey = ""; |
20 | |||
21 | public string DatabaseProvider = ""; | ||
20 | 22 | ||
21 | private ConfigurationMember configMember; | 23 | private ConfigurationMember configMember; |
22 | public GridConfig(string description, string filename) | 24 | public GridConfig(string description, string filename) |
@@ -38,7 +40,7 @@ namespace OpenSim.Framework.Configuration | |||
38 | 40 | ||
39 | configMember.addConfigurationOption("sim_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to a simulator", "null", false); | 41 | configMember.addConfigurationOption("sim_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to a simulator", "null", false); |
40 | configMember.addConfigurationOption("sim_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from a simulator", "null", false); | 42 | configMember.addConfigurationOption("sim_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from a simulator", "null", false); |
41 | 43 | configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false); | |
42 | } | 44 | } |
43 | 45 | ||
44 | public bool handleIncomingConfiguration(string configuration_key, object configuration_result) | 46 | public bool handleIncomingConfiguration(string configuration_key, object configuration_result) |
@@ -72,6 +74,9 @@ namespace OpenSim.Framework.Configuration | |||
72 | case "sim_recv_key": | 74 | case "sim_recv_key": |
73 | this.SimRecvKey = (string)configuration_result; | 75 | this.SimRecvKey = (string)configuration_result; |
74 | break; | 76 | break; |
77 | case "database_provider": | ||
78 | this.DatabaseProvider = (string)configuration_result; | ||
79 | break; | ||
75 | } | 80 | } |
76 | 81 | ||
77 | return true; | 82 | return true; |
diff --git a/OpenSim/Framework/General/Configuration/UserConfig.cs b/OpenSim/Framework/General/Configuration/UserConfig.cs index a027ffc..2183491 100644 --- a/OpenSim/Framework/General/Configuration/UserConfig.cs +++ b/OpenSim/Framework/General/Configuration/UserConfig.cs | |||
@@ -14,6 +14,8 @@ namespace OpenSim.Framework.Configuration | |||
14 | public string GridSendKey = ""; | 14 | public string GridSendKey = ""; |
15 | public string GridRecvKey = ""; | 15 | public string GridRecvKey = ""; |
16 | 16 | ||
17 | public string DatabaseProvider = ""; | ||
18 | |||
17 | private ConfigurationMember configMember; | 19 | private ConfigurationMember configMember; |
18 | 20 | ||
19 | public UserConfig(string description, string filename) | 21 | public UserConfig(string description, string filename) |
@@ -29,7 +31,7 @@ namespace OpenSim.Framework.Configuration | |||
29 | configMember.addConfigurationOption("default_grid_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Grid Server URI", "http://127.0.0.1:8001/", false); | 31 | configMember.addConfigurationOption("default_grid_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Grid Server URI", "http://127.0.0.1:8001/", false); |
30 | configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to grid server", "null", false); | 32 | configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to grid server", "null", false); |
31 | configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from grid server", "null", false); | 33 | configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from grid server", "null", false); |
32 | 34 | configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false); | |
33 | 35 | ||
34 | } | 36 | } |
35 | 37 | ||
@@ -49,6 +51,9 @@ namespace OpenSim.Framework.Configuration | |||
49 | case "grid_recv_key": | 51 | case "grid_recv_key": |
50 | this.GridRecvKey = (string)configuration_result; | 52 | this.GridRecvKey = (string)configuration_result; |
51 | break; | 53 | break; |
54 | case "database_provider": | ||
55 | this.DatabaseProvider = (string)configuration_result; | ||
56 | break; | ||
52 | } | 57 | } |
53 | 58 | ||
54 | return true; | 59 | return true; |
diff --git a/OpenSim/Grid/GridServer/Main.cs b/OpenSim/Grid/GridServer/Main.cs index c72948d..8353066 100644 --- a/OpenSim/Grid/GridServer/Main.cs +++ b/OpenSim/Grid/GridServer/Main.cs | |||
@@ -110,7 +110,7 @@ namespace OpenSim.Grid.GridServer | |||
110 | 110 | ||
111 | m_console.Verbose( "Main.cs:Startup() - Connecting to Storage Server"); | 111 | m_console.Verbose( "Main.cs:Startup() - Connecting to Storage Server"); |
112 | m_gridManager = new GridManager(); | 112 | m_gridManager = new GridManager(); |
113 | m_gridManager.AddPlugin(GridDll); // Made of win | 113 | m_gridManager.AddPlugin(Cfg.DatabaseProvider); // Made of win |
114 | m_gridManager.config = Cfg; | 114 | m_gridManager.config = Cfg; |
115 | 115 | ||
116 | m_console.Verbose( "Main.cs:Startup() - Starting HTTP process"); | 116 | m_console.Verbose( "Main.cs:Startup() - Starting HTTP process"); |
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs index 99401fc..a6571cf 100644 --- a/OpenSim/Grid/UserServer/Main.cs +++ b/OpenSim/Grid/UserServer/Main.cs | |||
@@ -86,7 +86,7 @@ namespace OpenSim.Grid.UserServer | |||
86 | MainLog.Instance.Verbose("Main.cs:Startup() - Establishing data connection"); | 86 | MainLog.Instance.Verbose("Main.cs:Startup() - Establishing data connection"); |
87 | m_userManager = new UserManager(); | 87 | m_userManager = new UserManager(); |
88 | m_userManager._config = Cfg; | 88 | m_userManager._config = Cfg; |
89 | m_userManager.AddPlugin(StorageDll); | 89 | m_userManager.AddPlugin(Cfg.DatabaseProvider); |
90 | 90 | ||
91 | MainLog.Instance.Verbose("Main.cs:Startup() - Starting HTTP process"); | 91 | MainLog.Instance.Verbose("Main.cs:Startup() - Starting HTTP process"); |
92 | BaseHttpServer httpServer = new BaseHttpServer(8002); | 92 | BaseHttpServer httpServer = new BaseHttpServer(8002); |