*** BIG CHANGES : REGION STORAGE MOVED : UPDATE YOUR OpenSim.ini FROM OpenSim.ini.example **

* Now moved region storage from region to application, so we have one storage per application, instead of one per region.
* Changed so that the region store providers use connectionstrings, not filenames
* Removed various unfit fields and properties (call me Darwin)

2 files changed, 3 insertions, 7 deletions

diff --git a/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs b/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs
index e375343..90cdf0a 100644
--- a/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs
+++ b/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Region.Environment.Interfaces
         /// </summary>
         /// <param name="filename">The file to save the database to (may not be applicable)</param>
         /// <param name="dbname">The name of the database to store to (may not be applicable)</param>
-        void Initialise(string filename, string dbname);
+        void Initialise(string filename);
 
         void StoreObject(SceneObjectGroup obj, LLUUID regionUUID);
         void RemoveObject(LLUUID uuid, LLUUID regionUUID);
diff --git a/OpenSim/Region/Environment/StorageManager.cs b/OpenSim/Region/Environment/StorageManager.cs
index 11f0ce0..b7bd8cc 100644
--- a/OpenSim/Region/Environment/StorageManager.cs
+++ b/OpenSim/Region/Environment/StorageManager.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.Environment
             m_dataStore = storage;
         }
 
-        public StorageManager(string dllName, string dataStoreFile, string dataStoreDB)
+        public StorageManager(string dllName, string connectionstring)
         {
             MainLog.Instance.Verbose("DATASTORE", "Attempting to load " + dllName);
             Assembly pluginAssembly = Assembly.LoadFrom(dllName);
@@ -62,19 +62,15 @@ namespace OpenSim.Region.Environment
                     {
                         IRegionDataStore plug =
                             (IRegionDataStore) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
-                        plug.Initialise(dataStoreFile, dataStoreDB);
+                        plug.Initialise(connectionstring);
 
                         m_dataStore = plug;
 
                         MainLog.Instance.Verbose("DATASTORE", "Added IRegionDataStore Interface");
                     }
-
-                    typeInterface = null;
                 }
             }
 
-            pluginAssembly = null;
-
             //TODO: Add checking and warning to make sure it initialised.
         }
     }