From 02db8b9adbfd69d117bc54288473f5240de46918 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 24 Nov 2012 03:49:23 +0000
Subject: Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as
 they are functionally identical.

Move TestDeleteSceneObjectAsync() and TestDeleteSceneObjectAsyncToUserInventory() from SceneObjectBasicTests -> SceneObjectDeRezTests
---
 OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs')

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
         UUID m_ownerId = TestHelpers.ParseTail(0x1);
 
         [SetUp]
-        public void SetUp()
+        public override void SetUp()
         {
+            base.SetUp();
+
             m_scene = new SceneHelpers().SetupScene();
         }
 
-- 
cgit v1.1