diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
index 94bf10e203..62c343637b 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
@@ -350,7 +350,26 @@ namespace OpenSim.Region.Environment.Scenes
                     TriggerScriptChangedEvent(Changed.INVENTORY);
                     
                     HasInventoryChanged = true;
-                    
+
+                    int scriptcount = 0;
+                    lock (m_taskInventory)
+                    {
+                        foreach (TaskInventoryItem item in m_taskInventory.Values)
+                        {
+                            if (item.Type == 10)
+                            {
+                                scriptcount++;
+                            }
+                        }
+
+                    }
+                    if (scriptcount <= 0)
+                    {
+                        RemFlag(LLObject.ObjectFlags.Scripted);
+                        ScheduleFullUpdate();
+                    }
+                    ScheduleFullUpdate(); 
+
                     return type;
                 }
                 else