add a database_connect field for the asset server config

which will let you specify a connection string.  Required
for Nhibernate, optional for sqlite (there is a sane default), 
ignored for mysql and mssql until someone implements the 
Iniatialise(string) method.

1 files changed, 9 insertions, 1 deletions

diff --git a/OpenSim/Framework/AssetConfig.cs b/OpenSim/Framework/AssetConfig.cs
index 6f43693..85dbaa6 100644
--- a/OpenSim/Framework/AssetConfig.cs
+++ b/OpenSim/Framework/AssetConfig.cs
@@ -38,7 +38,9 @@ namespace OpenSim.Framework
 
         public string DatabaseProvider = String.Empty;
 
-        public static uint DefaultHttpPort = 8003;
+        public string DatabaseConnect = String.Empty;
+
+        public const uint DefaultHttpPort = 8003;
         public uint HttpPort = DefaultHttpPort;
 
         private ConfigurationMember configMember;
@@ -59,6 +61,9 @@ namespace OpenSim.Framework
             configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
                                                 "DLL for database provider", "OpenSim.Data.MySQL.dll", false);
 
+            configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
+                                                "Database connection string", "", false);
+
             configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
                                                 "Http Listener port", DefaultHttpPort.ToString(), false);
         }
@@ -73,6 +78,9 @@ namespace OpenSim.Framework
                 case "database_provider":
                     DatabaseProvider = (string) configuration_result;
                     break;
+                case "database_connect":
+                    DatabaseConnect = (string) configuration_result;
+                    break;
                 case "http_port":
                     HttpPort = (uint) configuration_result;
                     break;