diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 14 |
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 fff39fb..e7a3b42 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -265,6 +265,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
265 | // | 265 | // |
266 | errors = part.Inventory.CreateScriptInstanceEr(item.ItemID, 0, false, DefaultScriptEngine, 0); | 266 | errors = part.Inventory.CreateScriptInstanceEr(item.ItemID, 0, false, DefaultScriptEngine, 0); |
267 | } | 267 | } |
268 | |||
269 | // Tell anyone managing scripts that a script has been reloaded/changed | ||
270 | EventManager.TriggerUpdateScript(remoteClient.AgentId, itemId, primId, isScriptRunning, item.AssetID); | ||
271 | |||
268 | part.ParentGroup.ResumeScripts(); | 272 | part.ParentGroup.ResumeScripts(); |
269 | return errors; | 273 | return errors; |
270 | } | 274 | } |
@@ -1643,9 +1647,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
1643 | // have state in inventory | 1647 | // have state in inventory |
1644 | part.Inventory.CreateScriptInstance(copyID, 0, false, DefaultScriptEngine, 0); | 1648 | part.Inventory.CreateScriptInstance(copyID, 0, false, DefaultScriptEngine, 0); |
1645 | 1649 | ||
1650 | // tell anyone watching that there is a new script in town | ||
1651 | EventManager.TriggerNewScript(agentID, part, copyID); | ||
1652 | |||
1646 | // m_log.InfoFormat("[PRIMINVENTORY]: " + | 1653 | // m_log.InfoFormat("[PRIMINVENTORY]: " + |
1647 | // "Rezzed script {0} into prim local ID {1} for user {2}", | 1654 | // "Rezzed script {0} into prim local ID {1} for user {2}", |
1648 | // item.inventoryName, localID, remoteClient.Name); | 1655 | // item.inventoryName, localID, remoteClient.Name); |
1656 | |||
1649 | part.ParentGroup.ResumeScripts(); | 1657 | part.ParentGroup.ResumeScripts(); |
1650 | 1658 | ||
1651 | return part; | 1659 | return part; |
@@ -1726,6 +1734,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
1726 | 1734 | ||
1727 | part.Inventory.AddInventoryItem(taskItem, false); | 1735 | part.Inventory.AddInventoryItem(taskItem, false); |
1728 | part.Inventory.CreateScriptInstance(taskItem, 0, false, DefaultScriptEngine, 0); | 1736 | part.Inventory.CreateScriptInstance(taskItem, 0, false, DefaultScriptEngine, 0); |
1737 | |||
1738 | // tell anyone managing scripts that a new script exists | ||
1739 | EventManager.TriggerNewScript(agentID, part, taskItem.ItemID); | ||
1740 | |||
1729 | part.ParentGroup.ResumeScripts(); | 1741 | part.ParentGroup.ResumeScripts(); |
1730 | 1742 | ||
1731 | return part; | 1743 | return part; |
@@ -1954,7 +1966,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1954 | permissionToTake = true; | 1966 | permissionToTake = true; |
1955 | permissionToDelete = true; | 1967 | permissionToDelete = true; |
1956 | 1968 | ||
1957 | AddReturn(grp.OwnerID, grp.Name, grp.AbsolutePosition, "parcel owner return"); | 1969 | AddReturn(grp.OwnerID == grp.GroupID ? grp.LastOwnerID : grp.OwnerID, grp.Name, grp.AbsolutePosition, "parcel owner return"); |
1958 | } | 1970 | } |
1959 | } | 1971 | } |
1960 | else // Auto return passes through here with null agent | 1972 | else // Auto return passes through here with null agent |