Factor out TaskInventoryItem

2 files changed, 6 insertions, 74 deletions

diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 4bbc2ed..a9b3fe9 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -1178,15 +1178,15 @@ namespace OpenSim.Region.Environment.Scenes
             SceneObjectPart part = GetChildPart(localID);
             if (part != null)
             {
-                SceneObjectPart.TaskInventoryItem taskItem = new SceneObjectPart.TaskInventoryItem();
+                TaskInventoryItem taskItem = new TaskInventoryItem();
                 taskItem.item_id = item.inventoryID;
                 taskItem.asset_id = item.assetID;
                 taskItem.name = item.inventoryName;
                 taskItem.desc = item.inventoryDescription;
                 taskItem.owner_id = item.avatarID;
                 taskItem.creator_id = item.creatorsID;
-                taskItem.type = SceneObjectPart.TaskInventoryItem.Types[item.assetType];
-                taskItem.inv_type = SceneObjectPart.TaskInventoryItem.Types[item.invType];
+                taskItem.type = TaskInventoryItem.Types[item.assetType];
+                taskItem.inv_type = TaskInventoryItem.Types[item.invType];
                 part.AddInventoryItem(taskItem);
                 return true;
             }
@@ -1200,15 +1200,15 @@ namespace OpenSim.Region.Environment.Scenes
                 SceneObjectPart part = GetChildPart(localID);
                 if (part != null)
                 {
-                    SceneObjectPart.TaskInventoryItem taskItem = new SceneObjectPart.TaskInventoryItem();
+                    TaskInventoryItem taskItem = new TaskInventoryItem();
                     taskItem.item_id = copyItemID;
                     taskItem.asset_id = item.assetID;
                     taskItem.name = item.inventoryName;
                     taskItem.desc = item.inventoryDescription;
                     taskItem.owner_id = new LLUUID(item.avatarID.ToString());
                     taskItem.creator_id = new LLUUID(item.creatorsID.ToString());
-                    taskItem.type = SceneObjectPart.TaskInventoryItem.Types[item.assetType];
-                    taskItem.inv_type = SceneObjectPart.TaskInventoryItem.InvTypes[item.invType];
+                    taskItem.type = TaskInventoryItem.Types[item.assetType];
+                    taskItem.inv_type = TaskInventoryItem.InvTypes[item.invType];
                     part.AddInventoryItem(taskItem);
                     return true;
                 }
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 2ddcf7b..b07b43c 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -1736,73 +1736,5 @@ namespace OpenSim.Region.Environment.Scenes
             {
             }
         }
-
-        public class TaskInventoryItem
-        {
-            /// <summary>
-            /// Inventory types
-            /// </summary>
-            public static string[] InvTypes = new string[]
-            {
-                "texture",
-                "sound",
-                "",
-                "",
-                "",
-                "",
-                "",
-                "",
-                "",
-                "",
-                "lsl_text",
-                ""
-            };
-            
-            /// <summary>
-            /// Asset types
-            /// </summary>
-            public static string[] Types = new string[]
-            {
-                "texture",
-                "sound",
-                "",
-                "",
-                "",
-                "",
-                "",
-                "",
-                "",
-                "",
-                "lsltext",
-                ""
-            };
-
-            public LLUUID item_id = LLUUID.Zero;
-            public LLUUID parent_id = LLUUID.Zero; //parent folder id 
-
-            public uint base_mask = FULL_MASK_PERMISSIONS_GENERAL;
-            public uint owner_mask = FULL_MASK_PERMISSIONS_GENERAL;
-            public uint group_mask = FULL_MASK_PERMISSIONS_GENERAL;
-            public uint everyone_mask = FULL_MASK_PERMISSIONS_GENERAL;
-            public uint next_owner_mask = FULL_MASK_PERMISSIONS_GENERAL;
-            public LLUUID creator_id = LLUUID.Zero;
-            public LLUUID owner_id = LLUUID.Zero;
-            public LLUUID last_owner_id = LLUUID.Zero;
-            public LLUUID group_id = LLUUID.Zero;
-
-            public LLUUID asset_id = LLUUID.Zero;
-            public string type = "";
-            public string inv_type = "";
-            public uint flags = 0;
-            public string name = "";
-            public string desc = "";
-            public uint creation_date = 0;
-
-            public LLUUID ParentPartID = LLUUID.Zero;
-
-            public TaskInventoryItem()
-            {
-            }
-        }
     }
 }