aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/GridConfig.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Framework/GridConfig.cs b/OpenSim/Framework/GridConfig.cs
index f0cf91f..e405b26 100644
--- a/OpenSim/Framework/GridConfig.cs
+++ b/OpenSim/Framework/GridConfig.cs
@@ -39,6 +39,7 @@ namespace OpenSim.Framework
39 39
40 private ConfigurationMember configMember; 40 private ConfigurationMember configMember;
41 public string DatabaseProvider = String.Empty; 41 public string DatabaseProvider = String.Empty;
42 public string DatabaseConnect = String.Empty;
42 public string DefaultAssetServer = String.Empty; 43 public string DefaultAssetServer = String.Empty;
43 public string DefaultUserServer = String.Empty; 44 public string DefaultUserServer = String.Empty;
44 public string GridOwner = String.Empty; 45 public string GridOwner = String.Empty;
@@ -85,6 +86,8 @@ namespace OpenSim.Framework
85 "Key to expect from a simulator", "null", false); 86 "Key to expect from a simulator", "null", false);
86 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 87 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
87 "DLL for database provider", "OpenSim.Data.MySQL.dll", false); 88 "DLL for database provider", "OpenSim.Data.MySQL.dll", false);
89 configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
90 "Database connect string", "", false);
88 91
89 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 92 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
90 "Http Listener port", DefaultHttpPort.ToString(), false); 93 "Http Listener port", DefaultHttpPort.ToString(), false);
@@ -128,6 +131,9 @@ namespace OpenSim.Framework
128 case "database_provider": 131 case "database_provider":
129 DatabaseProvider = (string) configuration_result; 132 DatabaseProvider = (string) configuration_result;
130 break; 133 break;
134 case "database_connect":
135 DatabaseConnect = (string) configuration_result;
136 break;
131 case "http_port": 137 case "http_port":
132 HttpPort = (uint) configuration_result; 138 HttpPort = (uint) configuration_result;
133 break; 139 break;