diff options
Re-added the ability to set the database provider (dll) in the config file for the userserver and gridserver.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/General/Configuration/GridConfig.cs | 7 |
1 files changed, 6 insertions, 1 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; |