From 759a6672470c6f942ba6ef4f43eb41209e9dea5c Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Tue, 25 Nov 2008 17:15:21 +0000
Subject: * Make a step on removing direct access to TaskInventoryDictionary
 from other packages

---
 .../Environment/Interfaces/IEntityInventory.cs     | 27 +++++-----------------
 .../Region/Environment/Scenes/SceneObjectPart.cs   |  6 ++---
 .../Environment/Scenes/SceneObjectPartInventory.cs |  4 ++--
 3 files changed, 11 insertions(+), 26 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Environment/Interfaces/IEntityInventory.cs b/OpenSim/Region/Environment/Interfaces/IEntityInventory.cs
index db809a0..a270293 100644
--- a/OpenSim/Region/Environment/Interfaces/IEntityInventory.cs
+++ b/OpenSim/Region/Environment/Interfaces/IEntityInventory.cs
@@ -44,36 +44,21 @@ namespace OpenSim.Region.Environment.Scenes
     /// 
     /// This is not a finished 1.0 candidate interface 
     public interface IEntityInventory
-    {        
-        /// <value>
-        /// Inventory serial number
-        /// </value>
-//        uint Serial
-//        {
-//            get;
-//            set; 
-//        }
-
-        /// <value>
-        /// Raw inventory data
-        /// </value>
-        TaskInventoryDictionary Items
-        {
-            get;
-            set;
-        }
-
+    {
         /// <summary>
         /// Force the task inventory of this prim to persist at the next update sweep
         /// </summary>
         void ForceInventoryPersistence();
 
         /// <summary>
-        /// Reset UUIDs for all the items in the prim's inventory.  This involves either generating
+        /// Reset UUIDs for all the items in the prim's inventory.
+        /// </summary>
+        /// 
+        /// This involves either generating
         /// new ones or setting existing UUIDs to the correct parent UUIDs.
         ///
         /// If this method is called and there are inventory items, then we regard the inventory as having changed.
-        /// </summary>
+        /// 
         /// <param name="linkNum">Link number for the part</param>
         void ResetInventoryIDs();
 
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 26a38a3..e97b99f 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -364,8 +364,8 @@ namespace OpenSim.Region.Environment.Scenes
         /// </value>        
         public TaskInventoryDictionary TaskInventory
         {
-            get { return Inventory.Items; }
-            set { Inventory.Items = value; }
+            get { return m_inventory.Items; }
+            set { m_inventory.Items = value; }
         }
 
         public uint ObjectFlags
@@ -1263,7 +1263,7 @@ if (m_shape != null) {
             dupe._category = _category;
             dupe.m_rezzed = m_rezzed;
 
-            dupe.Inventory.Items = (TaskInventoryDictionary)dupe.Inventory.Items.Clone();
+            dupe.m_inventory.Items = (TaskInventoryDictionary)dupe.m_inventory.Items.Clone();
 
             if (userExposed)
                 dupe.ResetIDs(linkNum);
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPartInventory.cs
index 82a89df..ae43c5e 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPartInventory.cs
@@ -69,7 +69,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// <value>
         /// Inventory serial number
         /// </value>
-        public uint Serial
+        protected internal uint Serial
         {
             get { return m_inventorySerial; }
             set { m_inventorySerial = value; }
@@ -78,7 +78,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// <value>
         /// Raw inventory data
         /// </value>
-        public TaskInventoryDictionary Items
+        protected internal TaskInventoryDictionary Items
         {
             get { return m_items; }
             set { m_items = value; }
-- 
cgit v1.1