2 files changed, 23 insertions, 3 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
index 6925b6c..e941210 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
@@ -60,7 +60,8 @@ namespace OpenSim.Region.Framework.Scenes
     public delegate bool ViewNotecardHandler(UUID script, UUID objectID, UUID user, Scene scene);
     public delegate bool EditScriptHandler(UUID script, UUID objectID, UUID user, Scene scene);
     public delegate bool EditNotecardHandler(UUID notecard, UUID objectID, UUID user, Scene scene);
-    public delegate bool RunScriptHandler(UUID script, UUID objectID, UUID user, Scene scene);
+    public delegate bool RunScriptHandlerByIDs(UUID script, UUID objectID, UUID user, Scene scene);
+    public delegate bool RunScriptHandler(TaskInventoryItem item, SceneObjectPart part);
     public delegate bool CompileScriptHandler(UUID ownerUUID, int scriptType, Scene scene);
     public delegate bool StartScriptHandler(UUID script, UUID user, Scene scene);
     public delegate bool StopScriptHandler(UUID script, UUID user, Scene scene);
@@ -131,6 +132,7 @@ namespace OpenSim.Region.Framework.Scenes
         public event ViewNotecardHandler OnViewNotecard;
         public event EditScriptHandler OnEditScript;
         public event EditNotecardHandler OnEditNotecard;
+        public event RunScriptHandlerByIDs OnRunScriptByIDs;
         public event RunScriptHandler OnRunScript;
         public event CompileScriptHandler OnCompileScript;
         public event StartScriptHandler OnStartScript;
@@ -654,19 +656,37 @@ namespace OpenSim.Region.Framework.Scenes
         #region RUN SCRIPT (When Script Placed in Object)
         public bool CanRunScript(UUID script, UUID objectID, UUID user)
         {
+            RunScriptHandlerByIDs handler = OnRunScriptByIDs;
+            if (handler != null)
+            {
+                Delegate[] list = handler.GetInvocationList();
+                foreach (RunScriptHandlerByIDs h in list)
+                {
+                    if (h(script, objectID, user, m_scene) == false)
+                        return false;
+                }
+            }
+            return true;
+        }
+
+        public bool CanRunScript(TaskInventoryItem item, SceneObjectPart part)
+        {
             RunScriptHandler handler = OnRunScript;
             if (handler != null)
             {
+                if(item == null || part == null)
+                    return false;
                 Delegate[] list = handler.GetInvocationList();
                 foreach (RunScriptHandler h in list)
                 {
-                    if (h(script, objectID, user, m_scene) == false)
+                    if (h(item, part) == false)
                         return false;
                 }
             }
             return true;
         }
 
+
         #endregion
 
         #region COMPILE SCRIPT (When Script needs to get (re)compiled)
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 545d44b..b53c355 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -360,7 +360,7 @@ namespace OpenSim.Region.Framework.Scenes
 //             m_log.DebugFormat("[PRIM INVENTORY]: Starting script {0} {1} in prim {2} {3} in {4}",
 //                 item.Name, item.ItemID, m_part.Name, m_part.UUID, m_part.ParentGroup.Scene.RegionInfo.RegionName);
 
-            if (!m_part.ParentGroup.Scene.Permissions.CanRunScript(item.ItemID, m_part.UUID, item.OwnerID))
+            if (!m_part.ParentGroup.Scene.Permissions.CanRunScript(item, m_part))
             {
                 StoreScriptError(item.ItemID, "no permission");
                 return false;