* Establish a common InventoryNodeBase class from InventoryItemBase and InventoryFolderBase

1 files changed, 2 insertions, 32 deletions

diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs
index cd96e01..ecc2d76 100644
--- a/OpenSim/Framework/InventoryItemBase.cs
+++ b/OpenSim/Framework/InventoryItemBase.cs
@@ -33,7 +33,7 @@ namespace OpenSim.Framework
     /// <summary>
     /// Inventory Item - contains all the properties associated with an individual inventory piece.
     /// </summary>
-    public class InventoryItemBase
+    public class InventoryItemBase : InventoryNodeBase
     {
         /// <summary>
         /// The UUID of the associated asset on the asset server
@@ -55,8 +55,6 @@ namespace OpenSim.Framework
         /// </summary>
         private UUID _creator;
 
-        private UUID _owner;
-
         private uint _nextPermissions;
 
         /// <summary>
@@ -85,22 +83,11 @@ namespace OpenSim.Framework
         private UUID _folder;
 
         /// <summary>
-        /// A UUID containing the ID for the inventory item itself
-        /// </summary>
-        private UUID _id;
-
-        /// <summary>
-        /// The type of inventory item. (Can be slightly different to the asset type
+        /// The inventory type of the item.  This is slightly different from the asset type in some situations.
         /// </summary>
         private int _invType;
 
         /// <summary>
-        /// The name of the inventory item (must be less than 64 characters)
-        /// </summary>
-        private string _name;
-
-
-        /// <summary>
         ///
         /// </summary>
         private UUID _groupID;
@@ -130,11 +117,6 @@ namespace OpenSim.Framework
         /// </summary>
         private int _creationDate;
 
-        public UUID ID {
-            get { return _id; }
-            set { _id = value; }
-        }
-
         public int InvType
         {
             get { return _invType; }
@@ -147,24 +129,12 @@ namespace OpenSim.Framework
             set { _folder = value; }
         }
 
-        public UUID Owner
-        {
-            get { return _owner; }
-            set { _owner = value; }
-        }
-
         public UUID Creator
         {
             get { return _creator; }
             set { _creator = value; }
         }
 
-        public string Name
-        {
-            get { return _name; }
-            set { _name = value; }
-        }
-
         public string Description
         {
             get { return _description; }