diff options
author | Melanie | 2012-07-16 23:34:52 +0100 |
---|---|---|
committer | Melanie | 2012-07-16 23:34:52 +0100 |
commit | 8204976fb4365d83f9a52599923417804d27416a (patch) | |
tree | 1f41bc85780813a3bc8ef9d1efb81e2d495b7e07 /OpenSim/Region/Framework | |
parent | Merge branch 'avination' into careminster (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC-8204976fb4365d83f9a52599923417804d27416a.zip opensim-SC-8204976fb4365d83f9a52599923417804d27416a.tar.gz opensim-SC-8204976fb4365d83f9a52599923417804d27416a.tar.bz2 opensim-SC-8204976fb4365d83f9a52599923417804d27416a.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IScriptModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 14 |
2 files changed, 0 insertions, 16 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IScriptModule.cs b/OpenSim/Region/Framework/Interfaces/IScriptModule.cs index 42dbedc..143af48 100644 --- a/OpenSim/Region/Framework/Interfaces/IScriptModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IScriptModule.cs | |||
@@ -77,8 +77,6 @@ namespace OpenSim.Region.Framework.Interfaces | |||
77 | /// <param name="itemID">The item ID of the script.</param> | 77 | /// <param name="itemID">The item ID of the script.</param> |
78 | bool GetScriptState(UUID itemID); | 78 | bool GetScriptState(UUID itemID); |
79 | 79 | ||
80 | void SetRunEnable(UUID instanceID, bool enable); | ||
81 | |||
82 | void SaveAllState(); | 80 | void SaveAllState(); |
83 | 81 | ||
84 | /// <summary> | 82 | /// <summary> |
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) |