2 files changed, 28 insertions, 5 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index bd67f1e..c649493 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -5200,6 +5200,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         }
                         break;
                     case PacketType.UpdateTaskInventory:
+                        m_log.DebugFormat("[AMW] UpdateTaskInventory request");
                         UpdateTaskInventoryPacket updatetask = (UpdateTaskInventoryPacket)Pack;
                         if (OnUpdateTaskInventory != null)
                         {
@@ -5266,7 +5267,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         break;
 
                     case PacketType.RezScript:
-
+                                                m_log.DebugFormat("[AMW] RezScript");
                         //Console.WriteLine(Pack.ToString());
                         RezScriptPacket rezScriptx = (RezScriptPacket)Pack;
 
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index c670076..a188701 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -1186,11 +1186,21 @@ namespace OpenSim.Region.Environment.Scenes
 
             if (part != null)
             {
-                if (part.OwnerID != remoteClient.AgentId)
-                    return;
 
-                if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0)
-                    return;
+                // replacing the following two checks with the
+                // ExternalChecks.ExternalChecksCanEditObject(...)
+                // call
+
+                // if (part.OwnerID != remoteClient.AgentId)
+                //     return;
+
+                // if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0)
+                //     return;
+
+                if (!ExternalChecks.ExternalChecksCanEditObject(part.UUID, remoteClient.AgentId))
+                                {
+                                        return;
+                                }
 
                 TaskInventoryItem currentItem = part.GetInventoryItem(itemID);
 
@@ -1283,11 +1293,23 @@ System.Console.WriteLine("Item asset {0}, request asset {1}", prevItem.AssetID.T
                         SceneObjectPart part = GetSceneObjectPart(localID);
                         if (part != null)
                         {
+
+                                                        /*
                             if (part.OwnerID != remoteClient.AgentId)
+                            {
                                 return;
+                            }
 
                             if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0)
+                            {
                                 return;
+                            }
+                                                        */
+
+                                                        if (!ExternalChecks.ExternalChecksCanEditObject(part.UUID, remoteClient.AgentId))
+                                                        {
+                                                                return;
+                                                        }
 
                             part.ParentGroup.AddInventoryItem(remoteClient, localID, item, copyID);
                             // TODO: set this to "true" when scripts in inventory have persistent state to fire on_rez