aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
diff options
context:
space:
mode:
authorMelanie Thielker2015-08-17 18:11:45 +0200
committerMelanie Thielker2015-08-17 18:11:45 +0200
commitee7debcca69d31573562dafead1f21d50931f632 (patch)
tree9c967ab1d0b639a209e13087acf5e6ceee7fde09 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
parentMerge branch 'master' of opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC-ee7debcca69d31573562dafead1f21d50931f632.zip
opensim-SC-ee7debcca69d31573562dafead1f21d50931f632.tar.gz
opensim-SC-ee7debcca69d31573562dafead1f21d50931f632.tar.bz2
opensim-SC-ee7debcca69d31573562dafead1f21d50931f632.tar.xz
Revert "When scripts are sleeping, don't count that as execution time"
The approach is good but the way it is written breaks the architecture. Rewrite follows. This reverts commit a568f06b7faea807149205d0e47454e4883e4836.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs4
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
index 9bb12d3..3406aea 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
@@ -51,7 +51,6 @@ using LSL_List = OpenSim.Region.ScriptEngine.Shared.LSL_Types.list;
51using LSL_Rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion; 51using LSL_Rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion;
52using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString; 52using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
53using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3; 53using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3;
54using System.Diagnostics;
55 54
56namespace OpenSim.Region.ScriptEngine.Shared.Api 55namespace OpenSim.Region.ScriptEngine.Shared.Api
57{ 56{
@@ -64,8 +63,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
64 internal IScriptModuleComms m_comms = null; 63 internal IScriptModuleComms m_comms = null;
65 64
66 public void Initialize( 65 public void Initialize(
67 IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item, WaitHandle coopSleepHandle, 66 IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item, WaitHandle coopSleepHandle)
68 Stopwatch executionTimer)
69 { 67 {
70 m_ScriptEngine = scriptEngine; 68 m_ScriptEngine = scriptEngine;
71 m_host = host; 69 m_host = host;