diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/UserConfig.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs index c176bbf..3c0bdfa 100644 --- a/OpenSim/Framework/UserConfig.cs +++ b/OpenSim/Framework/UserConfig.cs | |||
@@ -38,6 +38,7 @@ namespace OpenSim.Framework | |||
38 | public static bool DefaultHttpSSL = false; | 38 | public static bool DefaultHttpSSL = false; |
39 | private ConfigurationMember configMember; | 39 | private ConfigurationMember configMember; |
40 | public string DatabaseProvider = String.Empty; | 40 | public string DatabaseProvider = String.Empty; |
41 | public string DatabaseConnect = String.Empty; | ||
41 | public string DefaultStartupMsg = String.Empty; | 42 | public string DefaultStartupMsg = String.Empty; |
42 | public uint DefaultX = 1000; | 43 | public uint DefaultX = 1000; |
43 | public uint DefaultY = 1000; | 44 | public uint DefaultY = 1000; |
@@ -77,6 +78,8 @@ namespace OpenSim.Framework | |||
77 | false); | 78 | false); |
78 | configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, | 79 | configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, |
79 | "DLL for database provider", "OpenSim.Data.MySQL.dll", false); | 80 | "DLL for database provider", "OpenSim.Data.MySQL.dll", false); |
81 | configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING, | ||
82 | "Connection String for Database", "", false); | ||
80 | 83 | ||
81 | configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, | 84 | configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, |
82 | "Http Listener port", DefaultHttpPort.ToString(), false); | 85 | "Http Listener port", DefaultHttpPort.ToString(), false); |
@@ -110,6 +113,9 @@ namespace OpenSim.Framework | |||
110 | case "database_provider": | 113 | case "database_provider": |
111 | DatabaseProvider = (string) configuration_result; | 114 | DatabaseProvider = (string) configuration_result; |
112 | break; | 115 | break; |
116 | case "database_connect": | ||
117 | DatabaseConnect = (string) configuration_result; | ||
118 | break; | ||
113 | case "http_port": | 119 | case "http_port": |
114 | HttpPort = (uint) configuration_result; | 120 | HttpPort = (uint) configuration_result; |
115 | break; | 121 | break; |