diff options
| author | Jonathan Freedman | 2010-11-23 22:27:54 -0800 |
|---|---|---|
| committer | Jonathan Freedman | 2010-11-23 22:27:54 -0800 |
| commit | bc51dfc45eb73e34d91fd72d0a537ffc907a9da6 (patch) | |
| tree | 084062cd82e16edbff08a5e3b705458d915caf86 /OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs | |
| parent | Merge branch 'master-core' into mantis5110 (diff) | |
| parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
| download | opensim-SC_OLD-bc51dfc45eb73e34d91fd72d0a537ffc907a9da6.zip opensim-SC_OLD-bc51dfc45eb73e34d91fd72d0a537ffc907a9da6.tar.gz opensim-SC_OLD-bc51dfc45eb73e34d91fd72d0a537ffc907a9da6.tar.bz2 opensim-SC_OLD-bc51dfc45eb73e34d91fd72d0a537ffc907a9da6.tar.xz | |
Merge branch 'master-core' into mantis5110
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs index ab5968c..ef52363 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs | |||
| @@ -65,6 +65,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
| 65 | [TestFixtureSetUp] | 65 | [TestFixtureSetUp] |
| 66 | public void Init() | 66 | public void Init() |
| 67 | { | 67 | { |
| 68 | TestHelper.InMethod(); | ||
| 69 | |||
| 68 | scene = SceneSetupHelpers.SetupScene("Neighbour x", UUID.Random(), 1000, 1000); | 70 | scene = SceneSetupHelpers.SetupScene("Neighbour x", UUID.Random(), 1000, 1000); |
| 69 | scene2 = SceneSetupHelpers.SetupScene("Neighbour x+1", UUID.Random(), 1001, 1000); | 71 | scene2 = SceneSetupHelpers.SetupScene("Neighbour x+1", UUID.Random(), 1001, 1000); |
| 70 | scene3 = SceneSetupHelpers.SetupScene("Neighbour x-1", UUID.Random(), 999, 1000); | 72 | scene3 = SceneSetupHelpers.SetupScene("Neighbour x-1", UUID.Random(), 999, 1000); |