aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
authorRobert Adams2012-02-17 09:12:41 -0800
committerRobert Adams2012-02-17 09:12:41 -0800
commit6baa13ab7aeb7d0ee08f2460f52961dbd79bada1 (patch)
tree164b3fb1a8ab98f125b98d39d4720cb915bf3fa8 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
parentMerge branch 'master' of /home/opensim/src/opensim (diff)
downloadopensim-SC_OLD-6baa13ab7aeb7d0ee08f2460f52961dbd79bada1.zip
opensim-SC_OLD-6baa13ab7aeb7d0ee08f2460f52961dbd79bada1.tar.gz
opensim-SC_OLD-6baa13ab7aeb7d0ee08f2460f52961dbd79bada1.tar.bz2
opensim-SC_OLD-6baa13ab7aeb7d0ee08f2460f52961dbd79bada1.tar.xz
Add new and updated script events
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs12
1 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 9d9729e..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
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 }
@@ -1624,9 +1628,13 @@ namespace OpenSim.Region.Framework.Scenes
1624 // have state in inventory 1628 // have state in inventory
1625 part.Inventory.CreateScriptInstance(copyID, 0, false, DefaultScriptEngine, 0); 1629 part.Inventory.CreateScriptInstance(copyID, 0, false, DefaultScriptEngine, 0);
1626 1630
1631 // tell anyone watching that there is a new script in town
1632 EventManager.TriggerNewScript(agentID, part, copyID);
1633
1627 // m_log.InfoFormat("[PRIMINVENTORY]: " + 1634 // m_log.InfoFormat("[PRIMINVENTORY]: " +
1628 // "Rezzed script {0} into prim local ID {1} for user {2}", 1635 // "Rezzed script {0} into prim local ID {1} for user {2}",
1629 // item.inventoryName, localID, remoteClient.Name); 1636 // item.inventoryName, localID, remoteClient.Name);
1637
1630 part.ParentGroup.ResumeScripts(); 1638 part.ParentGroup.ResumeScripts();
1631 1639
1632 return part; 1640 return part;
@@ -1707,6 +1715,10 @@ namespace OpenSim.Region.Framework.Scenes
1707 1715
1708 part.Inventory.AddInventoryItem(taskItem, false); 1716 part.Inventory.AddInventoryItem(taskItem, false);
1709 part.Inventory.CreateScriptInstance(taskItem, 0, false, DefaultScriptEngine, 0); 1717 part.Inventory.CreateScriptInstance(taskItem, 0, false, DefaultScriptEngine, 0);
1718
1719 // tell anyone managing scripts that a new script exists
1720 EventManager.TriggerNewScript(agentID, part, taskItem.ItemID);
1721
1710 part.ParentGroup.ResumeScripts(); 1722 part.ParentGroup.ResumeScripts();
1711 1723
1712 return part; 1724 return part;