aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
diff options
context:
space:
mode:
authorMelanie2013-01-16 16:52:57 +0000
committerMelanie2013-01-16 16:52:57 +0000
commit9c99ed26ebe7cd2e42c10487e4ddfde0c934d921 (patch)
tree536b2d6530fdda925203afddd27a4b9444e4d2a7 /OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
parentComplete removal of the now unused state queue (diff)
parentChanged a couple of debug messages at the request of osgrid. (diff)
downloadopensim-SC-9c99ed26ebe7cd2e42c10487e4ddfde0c934d921.zip
opensim-SC-9c99ed26ebe7cd2e42c10487e4ddfde0c934d921.tar.gz
opensim-SC-9c99ed26ebe7cd2e42c10487e4ddfde0c934d921.tar.bz2
opensim-SC-9c99ed26ebe7cd2e42c10487e4ddfde0c934d921.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
index c41d1e7..e97ae06 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
@@ -33,6 +33,7 @@ using OpenSim.Region.ScriptEngine.Shared;
33using OpenSim.Region.Framework.Scenes; 33using OpenSim.Region.Framework.Scenes;
34using Nini.Config; 34using Nini.Config;
35using OpenSim.Region.ScriptEngine.Shared.Api; 35using OpenSim.Region.ScriptEngine.Shared.Api;
36using OpenSim.Region.ScriptEngine.Shared.Instance;
36using OpenSim.Region.ScriptEngine.Shared.ScriptBase; 37using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
37using OpenMetaverse; 38using OpenMetaverse;
38using System; 39using System;
@@ -66,7 +67,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
66 engine.AddRegion(scene); 67 engine.AddRegion(scene);
67 68
68 m_lslApi = new LSL_Api(); 69 m_lslApi = new LSL_Api();
69 m_lslApi.Initialize(engine, part, null); 70 m_lslApi.Initialize(engine, part, null, null);
70 } 71 }
71 72
72 [Test] 73 [Test]