Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

1 files changed, 13 insertions, 1 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 5a5307c..6cc78b8 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -283,6 +283,10 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 remoteClient.SendAgentAlertMessage("Script saved", false);
             }
+
+            // Tell anyone managing scripts that a script has been reloaded/changed
+            EventManager.TriggerUpdateScript(remoteClient.AgentId, itemId, primId, isScriptRunning, item.AssetID);
+
             part.ParentGroup.ResumeScripts();
             return errors;
         }
@@ -1624,9 +1628,13 @@ namespace OpenSim.Region.Framework.Scenes
                     // have state in inventory
                     part.Inventory.CreateScriptInstance(copyID, 0, false, DefaultScriptEngine, 0);
 
+                    // tell anyone watching that there is a new script in town
+                    EventManager.TriggerNewScript(agentID, part, copyID);
+
                     //                        m_log.InfoFormat("[PRIMINVENTORY]: " +
                     //                                         "Rezzed script {0} into prim local ID {1} for user {2}",
                     //                                         item.inventoryName, localID, remoteClient.Name);
+
                     part.ParentGroup.ResumeScripts();
 
                     return part;
@@ -1707,6 +1715,10 @@ namespace OpenSim.Region.Framework.Scenes
 
             part.Inventory.AddInventoryItem(taskItem, false);
             part.Inventory.CreateScriptInstance(taskItem, 0, false, DefaultScriptEngine, 0);
+
+            // tell anyone managing scripts that a new script exists
+            EventManager.TriggerNewScript(agentID, part, taskItem.ItemID);
+
             part.ParentGroup.ResumeScripts();
 
             return part;
@@ -1926,7 +1938,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                         foreach (SceneObjectGroup g in deleteGroups)
                         {
-                            AddReturn(g.OwnerID, g.Name, g.AbsolutePosition, "parcel owner return");
+                            AddReturn(g.OwnerID == g.GroupID ? g.LastOwnerID : g.OwnerID, g.Name, g.AbsolutePosition, "parcel owner return");
                         }
                     }
                 }