diff options
| author | Melanie | 2010-11-23 14:03:52 +0000 |
|---|---|---|
| committer | Melanie | 2010-11-23 14:03:52 +0000 |
| commit | 2527aeb40c5752016524e10797a6d09b4e6816af (patch) | |
| tree | e425b306aa311c639115904df9a68241078b1689 /OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs | |
| parent | Fix more potential nullrefs (diff) | |
| parent | Initialize InventoryItemBase.creatorData properly. Could throw. (diff) | |
| download | opensim-SC-2527aeb40c5752016524e10797a6d09b4e6816af.zip opensim-SC-2527aeb40c5752016524e10797a6d09b4e6816af.tar.gz opensim-SC-2527aeb40c5752016524e10797a6d09b4e6816af.tar.bz2 opensim-SC-2527aeb40c5752016524e10797a6d09b4e6816af.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to '')
| -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); |