diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 9d9729e..23f39a8 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 | |||
283 | { | 283 | { |
284 | remoteClient.SendAgentAlertMessage("Script saved", false); | 284 | remoteClient.SendAgentAlertMessage("Script saved", false); |
285 | } | 285 | } |
286 | |||
287 | // Tell anyone managing scripts that a script has been reloaded/changed | ||
288 | EventManager.TriggerUpdateScript(remoteClient.AgentId, itemId, primId, isScriptRunning, item.AssetID); | ||
289 | |||
286 | part.ParentGroup.ResumeScripts(); | 290 | part.ParentGroup.ResumeScripts(); |
287 | return errors; | 291 | return errors; |
288 | } | 292 | } |
@@ -1151,8 +1155,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1151 | return; | 1155 | return; |
1152 | } | 1156 | } |
1153 | 1157 | ||
1154 | TaskInventoryItem item = part.Inventory.GetInventoryItem(itemId); | 1158 | if ((taskItem.CurrentPermissions & (uint)PermissionMask.Copy) == 0) |
1155 | if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) | ||
1156 | { | 1159 | { |
1157 | // If the item to be moved is no copy, we need to be able to | 1160 | // If the item to be moved is no copy, we need to be able to |
1158 | // edit the prim. | 1161 | // edit the prim. |
@@ -1624,9 +1627,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
1624 | // have state in inventory | 1627 | // have state in inventory |
1625 | part.Inventory.CreateScriptInstance(copyID, 0, false, DefaultScriptEngine, 0); | 1628 | part.Inventory.CreateScriptInstance(copyID, 0, false, DefaultScriptEngine, 0); |
1626 | 1629 | ||
1630 | // tell anyone watching that there is a new script in town | ||
1631 | EventManager.TriggerNewScript(agentID, part, copyID); | ||
1632 | |||
1627 | // m_log.InfoFormat("[PRIMINVENTORY]: " + | 1633 | // m_log.InfoFormat("[PRIMINVENTORY]: " + |
1628 | // "Rezzed script {0} into prim local ID {1} for user {2}", | 1634 | // "Rezzed script {0} into prim local ID {1} for user {2}", |
1629 | // item.inventoryName, localID, remoteClient.Name); | 1635 | // item.inventoryName, localID, remoteClient.Name); |
1636 | |||
1630 | part.ParentGroup.ResumeScripts(); | 1637 | part.ParentGroup.ResumeScripts(); |
1631 | 1638 | ||
1632 | return part; | 1639 | return part; |
@@ -1707,6 +1714,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
1707 | 1714 | ||
1708 | part.Inventory.AddInventoryItem(taskItem, false); | 1715 | part.Inventory.AddInventoryItem(taskItem, false); |
1709 | part.Inventory.CreateScriptInstance(taskItem, 0, false, DefaultScriptEngine, 0); | 1716 | part.Inventory.CreateScriptInstance(taskItem, 0, false, DefaultScriptEngine, 0); |
1717 | |||
1718 | // tell anyone managing scripts that a new script exists | ||
1719 | EventManager.TriggerNewScript(agentID, part, taskItem.ItemID); | ||
1720 | |||
1710 | part.ParentGroup.ResumeScripts(); | 1721 | part.ParentGroup.ResumeScripts(); |
1711 | 1722 | ||
1712 | return part; | 1723 | return part; |