Prim inventory persistence phase 1: Creation of preliminary table in sqlite.

No user functionality yet.  This code is not turned on, so there is no possibility 
of disruption to existing databases.

3 files changed, 16 insertions, 19 deletions

diff --git a/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs b/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs
index 7c63027..91aa5ff 100644
--- a/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs
+++ b/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs
@@ -38,9 +38,10 @@ namespace OpenSim.Region.Environment.Interfaces
         /// <summary>
         /// Initialises the data storage engine
         /// </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);
+        /// <param name="filename">The file to save the database to (may not be applicable).  Alternatively,
+        /// a connection string for the database</param>
+        /// <param name="persistPrimInventories">Temporary switch while this option is immature</param>
+        void Initialise(string filename, bool persistPrimInventories);
 
         void StoreObject(SceneObjectGroup obj, LLUUID regionUUID);
         void RemoveObject(LLUUID uuid, LLUUID regionUUID);
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 33f481d..34705db 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -1008,21 +1008,17 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="localID"></param>
         public bool GetInventoryFileName(IClientAPI client, uint localID)
         {
-//            if (localID == m_localID)
-//            {
-                if (m_inventorySerial > 0)
-                {
-                    client.SendTaskInventory(m_uuid, (short)m_inventorySerial,
-                                             Helpers.StringToField(m_inventoryFileName));
-                    return true;
-                }
-                else
-                {
-                    client.SendTaskInventory(m_uuid, 0, new byte[0]);
-                    return false;
-                }
-//            }
-            return false;
+            if (m_inventorySerial > 0)
+            {
+                client.SendTaskInventory(m_uuid, (short)m_inventorySerial,
+                                         Helpers.StringToField(m_inventoryFileName));
+                return true;
+            }
+            else
+            {
+                client.SendTaskInventory(m_uuid, 0, new byte[0]);
+                return false;
+            }
         }
 
         public string RequestInventoryFile(IXfer xferManager)
diff --git a/OpenSim/Region/Environment/StorageManager.cs b/OpenSim/Region/Environment/StorageManager.cs
index b7bd8cc..2c04309 100644
--- a/OpenSim/Region/Environment/StorageManager.cs
+++ b/OpenSim/Region/Environment/StorageManager.cs
@@ -62,7 +62,7 @@ namespace OpenSim.Region.Environment
                     {
                         IRegionDataStore plug =
                             (IRegionDataStore) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
-                        plug.Initialise(connectionstring);
+                        plug.Initialise(connectionstring, false);
 
                         m_dataStore = plug;