diff options
author | UbitUmarov | 2012-07-17 01:40:27 +0100 |
---|---|---|
committer | UbitUmarov | 2012-07-17 01:40:27 +0100 |
commit | 2b2dbec176ee9c6918b24640cbe1299e5fb6687a (patch) | |
tree | ec309403fa6c891abf2c505abb45c3605c4154e0 /OpenSim/Region/Framework/Scenes | |
parent | Merge branch 'avination' into ubitwork (diff) | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC-2b2dbec176ee9c6918b24640cbe1299e5fb6687a.zip opensim-SC-2b2dbec176ee9c6918b24640cbe1299e5fb6687a.tar.gz opensim-SC-2b2dbec176ee9c6918b24640cbe1299e5fb6687a.tar.bz2 opensim-SC-2b2dbec176ee9c6918b24640cbe1299e5fb6687a.tar.xz |
Merge branch 'avination' into ubitwork
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 9776a82..98b8fcc 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -2298,24 +2298,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
2298 | if (part == null) | 2298 | if (part == null) |
2299 | return; | 2299 | return; |
2300 | 2300 | ||
2301 | IScriptModule[] engines = RequestModuleInterfaces<IScriptModule>(); | ||
2302 | |||
2303 | if (running) | 2301 | if (running) |
2304 | { | ||
2305 | foreach (IScriptModule engine in engines) | ||
2306 | { | ||
2307 | engine.SetRunEnable(itemID, true); | ||
2308 | } | ||
2309 | EventManager.TriggerStartScript(part.LocalId, itemID); | 2302 | EventManager.TriggerStartScript(part.LocalId, itemID); |
2310 | } | ||
2311 | else | 2303 | else |
2312 | { | ||
2313 | foreach (IScriptModule engine in engines) | ||
2314 | { | ||
2315 | engine.SetRunEnable(itemID, false); | ||
2316 | } | ||
2317 | EventManager.TriggerStopScript(part.LocalId, itemID); | 2304 | EventManager.TriggerStopScript(part.LocalId, itemID); |
2318 | } | ||
2319 | } | 2305 | } |
2320 | 2306 | ||
2321 | public void GetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID) | 2307 | public void GetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID) |