diff options
author | Diva Canto | 2012-04-27 09:26:14 -0700 |
---|---|---|
committer | Diva Canto | 2012-04-27 09:26:14 -0700 |
commit | 2970a18e54bc4811af67a2f0c307fb79c00c9a18 (patch) | |
tree | e4faab8dd2b55edff0632faf241c960ad553ccbc /OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs | |
parent | Minor change in error message (HG teleport failures) (diff) | |
parent | Add regression test for teleporting an agent between separated regions on the... (diff) | |
download | opensim-SC-2970a18e54bc4811af67a2f0c307fb79c00c9a18.zip opensim-SC-2970a18e54bc4811af67a2f0c307fb79c00c9a18.tar.gz opensim-SC-2970a18e54bc4811af67a2f0c307fb79c00c9a18.tar.bz2 opensim-SC-2970a18e54bc4811af67a2f0c307fb79c00c9a18.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs index 360566d..742c769 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs | |||
@@ -52,7 +52,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
52 | [SetUp] | 52 | [SetUp] |
53 | public void Init() | 53 | public void Init() |
54 | { | 54 | { |
55 | m_scene = SceneHelpers.SetupScene(); | 55 | m_scene = new SceneHelpers().SetupScene(); |
56 | m_so1 = SceneHelpers.CreateSceneObject(1, m_ownerId, "so1", 0x10); | 56 | m_so1 = SceneHelpers.CreateSceneObject(1, m_ownerId, "so1", 0x10); |
57 | m_so2 = SceneHelpers.CreateSceneObject(1, m_ownerId, "so2", 0x20); | 57 | m_so2 = SceneHelpers.CreateSceneObject(1, m_ownerId, "so2", 0x20); |
58 | } | 58 | } |