diff options
author | Melanie Thielker | 2015-08-17 21:46:30 +0200 |
---|---|---|
committer | Melanie Thielker | 2015-08-17 21:46:30 +0200 |
commit | c53f732163b391e4bcd33c8acb917deb7598e0a8 (patch) | |
tree | 6b396d1678db3ddbdecef28099666461452cf81c /OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiUserTests.cs | |
parent | Revert "When scripts are sleeping, don't count that as execution time" (diff) | |
download | opensim-SC-c53f732163b391e4bcd33c8acb917deb7598e0a8.zip opensim-SC-c53f732163b391e4bcd33c8acb917deb7598e0a8.tar.gz opensim-SC-c53f732163b391e4bcd33c8acb917deb7598e0a8.tar.bz2 opensim-SC-c53f732163b391e4bcd33c8acb917deb7598e0a8.tar.xz |
Change the IScriptApi back to it's original form, removing XEngine
specific additions that should not have been there in the first place.
Sleeping and time measurement are now completely internal to XEngine
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiUserTests.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiUserTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiUserTests.cs index 40082b5..a8964bf 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiUserTests.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiUserTests.cs | |||
@@ -71,7 +71,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests | |||
71 | TaskInventoryItem scriptItem = TaskInventoryHelpers.AddScript(m_scene.AssetService, part); | 71 | TaskInventoryItem scriptItem = TaskInventoryHelpers.AddScript(m_scene.AssetService, part); |
72 | 72 | ||
73 | LSL_Api apiGrp1 = new LSL_Api(); | 73 | LSL_Api apiGrp1 = new LSL_Api(); |
74 | apiGrp1.Initialize(m_engine, part, scriptItem, null); | 74 | apiGrp1.Initialize(m_engine, part, scriptItem); |
75 | 75 | ||
76 | // Initially long timeout to test cache | 76 | // Initially long timeout to test cache |
77 | apiGrp1.LlRequestAgentDataCacheTimeoutMs = 20000; | 77 | apiGrp1.LlRequestAgentDataCacheTimeoutMs = 20000; |
@@ -154,4 +154,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests | |||
154 | } | 154 | } |
155 | } | 155 | } |
156 | } | 156 | } |
157 | } \ No newline at end of file | 157 | } |