diff options
| author | Melanie | 2013-01-16 15:47:55 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-16 15:47:55 +0000 |
| commit | 818254916cb562422b3a3301b9f35fafd64ee3fe (patch) | |
| tree | e8655f6472b305d43a2f23059c375c90e7004a2b /OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-818254916cb562422b3a3301b9f35fafd64ee3fe.zip opensim-SC-818254916cb562422b3a3301b9f35fafd64ee3fe.tar.gz opensim-SC-818254916cb562422b3a3301b9f35fafd64ee3fe.tar.bz2 opensim-SC-818254916cb562422b3a3301b9f35fafd64ee3fe.tar.xz | |
JustinCC's core re-merge
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs index 1381d2b..c88bad5 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs | |||
| @@ -41,6 +41,7 @@ using OpenSim.Region.OptionalModules.World.NPC; | |||
| 41 | using OpenSim.Region.Framework.Scenes; | 41 | using OpenSim.Region.Framework.Scenes; |
| 42 | using OpenSim.Region.ScriptEngine.Shared; | 42 | using OpenSim.Region.ScriptEngine.Shared; |
| 43 | using OpenSim.Region.ScriptEngine.Shared.Api; | 43 | using OpenSim.Region.ScriptEngine.Shared.Api; |
| 44 | using OpenSim.Region.ScriptEngine.Shared.Instance; | ||
| 44 | using OpenSim.Services.Interfaces; | 45 | using OpenSim.Services.Interfaces; |
| 45 | using OpenSim.Tests.Common; | 46 | using OpenSim.Tests.Common; |
| 46 | using OpenSim.Tests.Common.Mock; | 47 | using OpenSim.Tests.Common.Mock; |
| @@ -93,7 +94,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests | |||
| 93 | m_scene.AddSceneObject(so); | 94 | m_scene.AddSceneObject(so); |
| 94 | 95 | ||
| 95 | OSSL_Api osslApi = new OSSL_Api(); | 96 | OSSL_Api osslApi = new OSSL_Api(); |
| 96 | osslApi.Initialize(m_engine, part, null); | 97 | osslApi.Initialize(m_engine, part, null, null); |
| 97 | 98 | ||
| 98 | string notecardName = "appearanceNc"; | 99 | string notecardName = "appearanceNc"; |
| 99 | 100 | ||
| @@ -134,7 +135,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests | |||
| 134 | m_scene.AddSceneObject(so); | 135 | m_scene.AddSceneObject(so); |
| 135 | 136 | ||
| 136 | OSSL_Api osslApi = new OSSL_Api(); | 137 | OSSL_Api osslApi = new OSSL_Api(); |
| 137 | osslApi.Initialize(m_engine, part, null); | 138 | osslApi.Initialize(m_engine, part, null, null); |
| 138 | 139 | ||
| 139 | string notecardName = "appearanceNc"; | 140 | string notecardName = "appearanceNc"; |
| 140 | 141 | ||