* Create TestScene to get at the async object deleter for use in a future test

3 files changed, 58 insertions, 3 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 35618db..298b9ff 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// <summary>
         /// Allows asynchronous derezzing of objects from the scene into a client's inventory.
         /// </summary>
-        private AsyncSceneObjectGroupDeleter m_asyncSceneObjectDeleter;    
+        protected AsyncSceneObjectGroupDeleter m_asyncSceneObjectDeleter;    
 
         /// <summary>
         /// Start all the scripts in the scene which should be started.
diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs b/OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs
index b603e30..c5bb9aa 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs
+++ b/OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.Environment.Scenes.Tests
         /// <summary>
         /// Set up a test scene
         /// </summary>
-        private Scene SetupScene()
+        private TestScene SetupScene()
         {
             RegionInfo regInfo = new RegionInfo(1000, 1000, null, null);
             regInfo.RegionName = "Unit test region";
@@ -70,7 +70,7 @@ namespace OpenSim.Region.Environment.Scenes.Tests
             StorageManager sm = new OpenSim.Region.Environment.StorageManager("OpenSim.Data.Null.dll", "", "");
             IConfigSource configSource = new IniConfigSource();
             
-            return new Scene(regInfo, acm, cm, scs, null, sm, null, null, false, false, false, configSource, null);            
+            return new TestScene(regInfo, acm, cm, scs, null, sm, null, null, false, false, false, configSource, null);            
         }
         
         /// <summary>
diff --git a/OpenSim/Region/Environment/Scenes/Tests/TestScene.cs b/OpenSim/Region/Environment/Scenes/Tests/TestScene.cs
new file mode 100644
index 0000000..744af7d
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/Tests/TestScene.cs
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using Nini.Config;
+using OpenSim.Framework;
+using OpenSim.Framework.Communications;
+using OpenSim.Framework.Communications.Cache;
+using OpenSim.Framework.Servers;
+using OpenSim.Region.Environment.Scenes;
+
+namespace OpenSim.Region.Environment.Scenes.Tests
+{        
+    public class TestScene : Scene
+    {        
+        public TestScene(
+            RegionInfo regInfo, AgentCircuitManager authen,
+            CommunicationsManager commsMan, SceneCommunicationService sceneGridService,
+            AssetCache assetCach, StorageManager storeManager, BaseHttpServer httpServer,
+            ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim,
+            bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion)
+            : base(regInfo, authen, commsMan, sceneGridService, assetCach, storeManager, httpServer, moduleLoader,
+                   dumpAssetsToFile, physicalPrim, SeeIntoRegionFromNeighbor, config, simulatorVersion)
+        {
+        }
+            
+        public AsyncSceneObjectGroupDeleter SceneObjectGroupDeleter
+        {
+            get { return m_asyncSceneObjectDeleter; }
+        }
+    }
+}