Defer sending of CHANGED_OWNER to make it work on rezzed objects and

attachments in addition to objects sold in place

2 files changed, 15 insertions, 3 deletions

diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs
index 2b0096b..2cb7895 100644
--- a/OpenSim/Framework/TaskInventoryItem.cs
+++ b/OpenSim/Framework/TaskInventoryItem.cs
@@ -122,6 +122,8 @@ namespace OpenSim.Framework
         private int _type = 0;
         private UUID _oldID;
 
+        private bool _ownerChanged = false;
+
         public UUID AssetID {
             get {
                 return _assetID;
@@ -320,6 +322,15 @@ namespace OpenSim.Framework
             }
         }
 
+        public bool OwnerChanged {
+            get {
+                return _ownerChanged;
+            }
+            set {
+                _ownerChanged = value;
+            }
+        }
+
         // See ICloneable
 
         #region ICloneable Members
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 4da63c0..eea73ff 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -955,10 +955,9 @@ namespace OpenSim.Region.Framework.Scenes
                     item.CurrentPermissions &= item.NextPermissions;
                     item.BasePermissions &= item.NextPermissions;
                     item.EveryonePermissions &= item.NextPermissions;
+                    item.OwnerChanged = true;
                 }
             }
-
-            m_part.TriggerScriptChangedEvent(Changed.OWNER);
         }
 
         public void ApplyGodPermissions(uint perms)
@@ -1042,7 +1041,6 @@ namespace OpenSim.Region.Framework.Scenes
             if (engines == null)
                 return;
 
-
             lock (m_items)
             {
                 foreach (TaskInventoryItem item in m_items.Values)
@@ -1052,7 +1050,10 @@ namespace OpenSim.Region.Framework.Scenes
                         foreach (IScriptModule engine in engines)
                         {
                             if (engine != null)
+                            {
+                                engine.PostScriptEvent(item.ItemID, "changed", new Object[] { Changed.OWNER });
                                 engine.ResumeScript(item.ItemID);
+                            }
                         }
                     }
                 }