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_ApiObjectTests.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_ApiObjectTests.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiObjectTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiObjectTests.cs index caf2b05..d957bf2 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiObjectTests.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiObjectTests.cs | |||
@@ -89,7 +89,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests | |||
89 | m_scene.AddSceneObject(grp1); | 89 | m_scene.AddSceneObject(grp1); |
90 | 90 | ||
91 | LSL_Api apiGrp1 = new LSL_Api(); | 91 | LSL_Api apiGrp1 = new LSL_Api(); |
92 | apiGrp1.Initialize(m_engine, grp1.RootPart, null, null); | 92 | apiGrp1.Initialize(m_engine, grp1.RootPart, null); |
93 | 93 | ||
94 | // Check simple 1 prim case | 94 | // Check simple 1 prim case |
95 | { | 95 | { |
@@ -167,7 +167,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests | |||
167 | Assert.That(scene.AddNewSceneObject(new SceneObjectGroup(part1), false), Is.True); | 167 | Assert.That(scene.AddNewSceneObject(new SceneObjectGroup(part1), false), Is.True); |
168 | 168 | ||
169 | LSL_Api apiGrp1 = new LSL_Api(); | 169 | LSL_Api apiGrp1 = new LSL_Api(); |
170 | apiGrp1.Initialize(m_engine, part1, null, null); | 170 | apiGrp1.Initialize(m_engine, part1, null); |
171 | 171 | ||
172 | // Note that prim hollow check is passed with the other prim params in order to allow the | 172 | // Note that prim hollow check is passed with the other prim params in order to allow the |
173 | // specification of a different check value from the prim param. A cylinder, prism, sphere, | 173 | // specification of a different check value from the prim param. A cylinder, prism, sphere, |
@@ -395,4 +395,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests | |||
395 | } | 395 | } |
396 | 396 | ||
397 | } | 397 | } |
398 | } \ No newline at end of file | 398 | } |