diff options
| author | Melanie Thielker | 2015-08-17 18:11:45 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2015-08-17 18:11:45 +0200 |
| commit | ee7debcca69d31573562dafead1f21d50931f632 (patch) | |
| tree | 9c967ab1d0b639a209e13087acf5e6ceee7fde09 /OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs | |
| parent | Merge branch 'master' of opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-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/Tests/OSSL_ApiAppearanceTest.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs index f452646..4c31969 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs | |||
| @@ -93,7 +93,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests | |||
| 93 | m_scene.AddSceneObject(so); | 93 | m_scene.AddSceneObject(so); |
| 94 | 94 | ||
| 95 | OSSL_Api osslApi = new OSSL_Api(); | 95 | OSSL_Api osslApi = new OSSL_Api(); |
| 96 | osslApi.Initialize(m_engine, part, null, null, null); | 96 | osslApi.Initialize(m_engine, part, null, null); |
| 97 | 97 | ||
| 98 | string notecardName = "appearanceNc"; | 98 | string notecardName = "appearanceNc"; |
| 99 | 99 | ||
| @@ -134,7 +134,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests | |||
| 134 | m_scene.AddSceneObject(so); | 134 | m_scene.AddSceneObject(so); |
| 135 | 135 | ||
| 136 | OSSL_Api osslApi = new OSSL_Api(); | 136 | OSSL_Api osslApi = new OSSL_Api(); |
| 137 | osslApi.Initialize(m_engine, part, null, null, null); | 137 | osslApi.Initialize(m_engine, part, null, null); |
| 138 | 138 | ||
| 139 | string notecardName = "appearanceNc"; | 139 | string notecardName = "appearanceNc"; |
| 140 | 140 | ||