diff options
author | Justin Clark-Casey (justincc) | 2012-07-17 00:02:45 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-07-17 00:02:45 +0100 |
commit | b0facd147a229fb16b271da19aaa1ff9cf308db2 (patch) | |
tree | e264811564bcb4c054370cab8d4b3c18b01a8a8e /OpenSim/Region/Framework/Scenes | |
parent | Stop sending the viewer an inventory create message if a known attachment ite... (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC-b0facd147a229fb16b271da19aaa1ff9cf308db2.zip opensim-SC-b0facd147a229fb16b271da19aaa1ff9cf308db2.tar.gz opensim-SC-b0facd147a229fb16b271da19aaa1ff9cf308db2.tar.bz2 opensim-SC-b0facd147a229fb16b271da19aaa1ff9cf308db2.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 9ff8467..e413281 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -2143,24 +2143,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
2143 | if (part == null) | 2143 | if (part == null) |
2144 | return; | 2144 | return; |
2145 | 2145 | ||
2146 | IScriptModule[] engines = RequestModuleInterfaces<IScriptModule>(); | ||
2147 | |||
2148 | if (running) | 2146 | if (running) |
2149 | { | ||
2150 | foreach (IScriptModule engine in engines) | ||
2151 | { | ||
2152 | engine.SetRunEnable(itemID, true); | ||
2153 | } | ||
2154 | EventManager.TriggerStartScript(part.LocalId, itemID); | 2147 | EventManager.TriggerStartScript(part.LocalId, itemID); |
2155 | } | ||
2156 | else | 2148 | else |
2157 | { | ||
2158 | foreach (IScriptModule engine in engines) | ||
2159 | { | ||
2160 | engine.SetRunEnable(itemID, false); | ||
2161 | } | ||
2162 | EventManager.TriggerStopScript(part.LocalId, itemID); | 2149 | EventManager.TriggerStopScript(part.LocalId, itemID); |
2163 | } | ||
2164 | } | 2150 | } |
2165 | 2151 | ||
2166 | public void GetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID) | 2152 | public void GetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID) |