diff options
| author | Justin Clark-Casey (justincc) | 2012-11-24 03:49:23 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-11-24 03:49:23 +0000 |
| commit | 02db8b9adbfd69d117bc54288473f5240de46918 (patch) | |
| tree | 9cbe64bb15ea8cea642ae5af48f3fb33904dc922 /OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs | |
| parent | Fix regression TestDeleteSceneObjectAsyncToUserInventory by adding a BasicInv... (diff) | |
| download | opensim-SC-02db8b9adbfd69d117bc54288473f5240de46918.zip opensim-SC-02db8b9adbfd69d117bc54288473f5240de46918.tar.gz opensim-SC-02db8b9adbfd69d117bc54288473f5240de46918.tar.bz2 opensim-SC-02db8b9adbfd69d117bc54288473f5240de46918.tar.xz | |
Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are functionally identical.
Move TestDeleteSceneObjectAsync() and TestDeleteSceneObjectAsyncToUserInventory() from SceneObjectBasicTests -> SceneObjectDeRezTests
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs index 5cf62c2..abaa1d1 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs | |||
| @@ -48,8 +48,10 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
| 48 | UUID m_ownerId = TestHelpers.ParseTail(0x1); | 48 | UUID m_ownerId = TestHelpers.ParseTail(0x1); |
| 49 | 49 | ||
| 50 | [SetUp] | 50 | [SetUp] |
| 51 | public void SetUp() | 51 | public override void SetUp() |
| 52 | { | 52 | { |
| 53 | base.SetUp(); | ||
| 54 | |||
| 53 | m_scene = new SceneHelpers().SetupScene(); | 55 | m_scene = new SceneHelpers().SetupScene(); |
| 54 | } | 56 | } |
| 55 | 57 | ||