First set of merge fixes

1 files changed, 10 insertions, 9 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 89f3683..63dd550 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -968,24 +968,25 @@ namespace OpenSim.Region.Framework.Scenes
             if (part != null)
             {
                 group = part.ParentGroup;
-            }            
+            }
             if (part != null && group != null)
             {
                 if (!Permissions.CanEditObjectInventory(part.UUID, remoteClient.AgentId))
                     return;
-                
+
                 TaskInventoryItem item = group.GetInventoryItem(localID, itemID);
                 if (item == null)
                     return;
 
-            if (item.Type == 10)
-            {
-                part.RemoveScriptEvents(itemID);
-                EventManager.TriggerRemoveScript(localID, itemID);
+                if (item.Type == 10)
+                {
+                    part.RemoveScriptEvents(itemID);
+                    EventManager.TriggerRemoveScript(localID, itemID);
+                }
+
+                group.RemoveInventoryItem(localID, itemID);
+                part.GetProperties(remoteClient);
             }
-            
-            group.RemoveInventoryItem(localID, itemID);
-            part.GetProperties(remoteClient);
         }
 
         private InventoryItemBase CreateAgentInventoryItemFromTask(UUID destAgent, SceneObjectPart part, UUID itemId)