plumb in connection string to the user database paths. mysql and mssql

just ignore this for now, but it lets us get connect strings to sqlite
and nhibernate.

3 files changed, 11 insertions, 5 deletions

diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index 29bfe22..51a5036 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Framework.Communications
         /// Adds a new user server plugin - user servers will be requested in the order they were loaded.
         /// </summary>
         /// <param name="FileName">The filename to the user server plugin DLL</param>
-        public void AddPlugin(string FileName)
+        public void AddPlugin(string FileName, string connect)
         {
             if (!String.IsNullOrEmpty(FileName))
             {
@@ -71,16 +71,16 @@ namespace OpenSim.Framework.Communications
                         {
                             IUserData plug =
                                 (IUserData) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
-                            AddPlugin(plug);
+                            AddPlugin(plug, connect);
                         }
                     }
                 }
             }
         }
 
-        public void AddPlugin(IUserData plug)
+        public void AddPlugin(IUserData plug, string connect)
         {
-            plug.Initialise();
+            plug.Initialise(connect);
             _plugins.Add(plug.Name, plug);
             m_log.Info("[USERSTORAGE]: Added IUserData Interface");
         }
diff --git a/OpenSim/Framework/IUserData.cs b/OpenSim/Framework/IUserData.cs
index b75a229..1e557d3 100644
--- a/OpenSim/Framework/IUserData.cs
+++ b/OpenSim/Framework/IUserData.cs
@@ -173,7 +173,7 @@ namespace OpenSim.Framework
         /// <summary>
         /// Initialises the plugin (artificial constructor)
         /// </summary>
-        void Initialise();
+        void Initialise(string connect);
 
         /// <summary>
         /// Gets the user appearance
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
         public static bool DefaultHttpSSL = false;
         private ConfigurationMember configMember;
         public string DatabaseProvider = String.Empty;
+        public string DatabaseConnect = String.Empty;
         public string DefaultStartupMsg = String.Empty;
         public uint DefaultX = 1000;
         public uint DefaultY = 1000;
@@ -77,6 +78,8 @@ namespace OpenSim.Framework
                                                 false);
             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,
+                                                "Connection String for Database", "", false);
 
             configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
                                                 "Http Listener port", DefaultHttpPort.ToString(), false);
@@ -110,6 +113,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;