From 331aef2bae0f8d23a43e238d229ac63c831063f6 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Mon, 21 Jan 2008 15:17:09 +0000
Subject: Method rename

---
 OpenSim/Framework/Data.MySQL/MySQLDataStore.cs                 | 2 +-
 OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs              | 2 +-
 OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs | 8 +++++---
 3 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
index a752236..47b3c43 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
@@ -312,7 +312,7 @@ namespace OpenSim.Framework.Data.MySQL
                 MainLog.Instance.Verbose("DATASTORE", "Restored item {0}, {1}", item.Name, item.ItemID); 
             }
             
-            prim.AddInventoryItems(inventory);
+            prim.RestoreInventoryItems(inventory);
             
             // XXX A nasty little hack to recover the folder id for the prim (which is currently stored in 
             // every item).  This data should really be stored in the prim table itself.
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs b/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs
index ba50dca..0035311 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs
@@ -356,7 +356,7 @@ namespace OpenSim.Framework.Data.SQLite
                 MainLog.Instance.Verbose("DATASTORE", "Restored item {0}, {1}", item.Name, item.ItemID); 
             }
             
-            prim.AddInventoryItems(inventory);
+            prim.RestoreInventoryItems(inventory);
             
             // XXX A nasty little hack to recover the folder id for the prim (which is currently stored in 
             // every item).  This data should really be stored in the prim table itself.
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
index c0297cf..a700974 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
@@ -216,11 +216,13 @@ namespace OpenSim.Region.Environment.Scenes
         }
         
         /// <summary>
-        /// Add a whole collection of items to the prim's inventory at once.  We assume that the items already
-        /// have all their fields correctly filled out.
+        /// Restore a whole collection of items to the prim's inventory at once.  
+        /// We assume that the items already have all their fields correctly filled out.
+        /// The items are not flagged for persistence to the database, since they are being restored 
+        /// from persistence rather than being newly added.
         /// </summary>
         /// <param name="items"></param>
-        public void AddInventoryItems(ICollection<TaskInventoryItem> items)
+        public void RestoreInventoryItems(ICollection<TaskInventoryItem> items)
         {
             lock (m_taskInventory)
             {                 
-- 
cgit v1.1