aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorUbitUmarov2012-07-17 01:40:27 +0100
committerUbitUmarov2012-07-17 01:40:27 +0100
commit2b2dbec176ee9c6918b24640cbe1299e5fb6687a (patch)
treeec309403fa6c891abf2c505abb45c3605c4154e0 /OpenSim/Region/Framework
parentMerge branch 'avination' into ubitwork (diff)
parentMerge branch 'master' into careminster (diff)
downloadopensim-SC_OLD-2b2dbec176ee9c6918b24640cbe1299e5fb6687a.zip
opensim-SC_OLD-2b2dbec176ee9c6918b24640cbe1299e5fb6687a.tar.gz
opensim-SC_OLD-2b2dbec176ee9c6918b24640cbe1299e5fb6687a.tar.bz2
opensim-SC_OLD-2b2dbec176ee9c6918b24640cbe1299e5fb6687a.tar.xz
Merge branch 'avination' into ubitwork
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Interfaces/IScriptModule.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs14
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)