From fcb8b2a3c319d2408014eeb11fd53015a71b5ff0 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Wed, 8 Nov 2017 09:10:56 +0000
Subject: mantis 8260 fix script count on delete and remove
 redundantTriggerRemoveScript in 2 points

---
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs          | 6 +++---
 OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 057ca17..f29cdf4 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1209,10 +1209,10 @@ namespace OpenSim.Region.Framework.Scenes
 
                 if (group.GetInventoryItem(localID, itemID) != null)
                 {
-                    if (item.Type == 10)
+                    if (item.Type == (int)InventoryType.LSL)
                     {
                         part.RemoveScriptEvents(itemID);
-                        EventManager.TriggerRemoveScript(localID, itemID);
+                        part.ParentGroup.AddActiveScriptCount(-1);
                     }
 
                     group.RemoveInventoryItem(localID, itemID);
@@ -1317,7 +1317,7 @@ namespace OpenSim.Region.Framework.Scenes
                     if (taskItem.Type == (int)AssetType.LSLText)
                     {
                         part.RemoveScriptEvents(itemId);
-                        EventManager.TriggerRemoveScript(part.LocalId, itemId);
+                        part.ParentGroup.AddActiveScriptCount(-1);
                     }
 
                     part.Inventory.RemoveInventoryItem(itemId);
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 3fd6e13..de9d986 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -1081,7 +1081,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 int type = m_items[itemID].InvType;
                 m_items.LockItemsForRead(false);
-                if (type == 10) // Script
+                if (type == (int)InventoryType.LSL) // Script
                 {
                     m_part.ParentGroup.Scene.EventManager.TriggerRemoveScript(m_part.LocalId, itemID);
                 }
@@ -1101,7 +1101,7 @@ namespace OpenSim.Region.Framework.Scenes
                 m_items.LockItemsForRead(true);
                 foreach (TaskInventoryItem item in m_items.Values)
                 {
-                    if (item.Type == 10)
+                    if (item.Type == (int)InventoryType.LSL)
                     {
                         scriptcount++;
                     }
-- 
cgit v1.1