aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/Tests/TestScene.cs55
-rw-r--r--prebuild.xml7
4 files changed, 62 insertions, 6 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
48 /// <summary> 48 /// <summary>
49 /// Allows asynchronous derezzing of objects from the scene into a client's inventory. 49 /// Allows asynchronous derezzing of objects from the scene into a client's inventory.
50 /// </summary> 50 /// </summary>
51 private AsyncSceneObjectGroupDeleter m_asyncSceneObjectDeleter; 51 protected AsyncSceneObjectGroupDeleter m_asyncSceneObjectDeleter;
52 52
53 /// <summary> 53 /// <summary>
54 /// Start all the scripts in the scene which should be started. 54 /// 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
58 /// <summary> 58 /// <summary>
59 /// Set up a test scene 59 /// Set up a test scene
60 /// </summary> 60 /// </summary>
61 private Scene SetupScene() 61 private TestScene SetupScene()
62 { 62 {
63 RegionInfo regInfo = new RegionInfo(1000, 1000, null, null); 63 RegionInfo regInfo = new RegionInfo(1000, 1000, null, null);
64 regInfo.RegionName = "Unit test region"; 64 regInfo.RegionName = "Unit test region";
@@ -70,7 +70,7 @@ namespace OpenSim.Region.Environment.Scenes.Tests
70 StorageManager sm = new OpenSim.Region.Environment.StorageManager("OpenSim.Data.Null.dll", "", ""); 70 StorageManager sm = new OpenSim.Region.Environment.StorageManager("OpenSim.Data.Null.dll", "", "");
71 IConfigSource configSource = new IniConfigSource(); 71 IConfigSource configSource = new IniConfigSource();
72 72
73 return new Scene(regInfo, acm, cm, scs, null, sm, null, null, false, false, false, configSource, null); 73 return new TestScene(regInfo, acm, cm, scs, null, sm, null, null, false, false, false, configSource, null);
74 } 74 }
75 75
76 /// <summary> 76 /// <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 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSim Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using Nini.Config;
29using OpenSim.Framework;
30using OpenSim.Framework.Communications;
31using OpenSim.Framework.Communications.Cache;
32using OpenSim.Framework.Servers;
33using OpenSim.Region.Environment.Scenes;
34
35namespace OpenSim.Region.Environment.Scenes.Tests
36{
37 public class TestScene : Scene
38 {
39 public TestScene(
40 RegionInfo regInfo, AgentCircuitManager authen,
41 CommunicationsManager commsMan, SceneCommunicationService sceneGridService,
42 AssetCache assetCach, StorageManager storeManager, BaseHttpServer httpServer,
43 ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim,
44 bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion)
45 : base(regInfo, authen, commsMan, sceneGridService, assetCach, storeManager, httpServer, moduleLoader,
46 dumpAssetsToFile, physicalPrim, SeeIntoRegionFromNeighbor, config, simulatorVersion)
47 {
48 }
49
50 public AsyncSceneObjectGroupDeleter SceneObjectGroupDeleter
51 {
52 get { return m_asyncSceneObjectDeleter; }
53 }
54 }
55}
diff --git a/prebuild.xml b/prebuild.xml
index 2fbb337..9d66e9b 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -877,9 +877,10 @@
877 <Reference name="OpenMetaverseTypes.dll"/> 877 <Reference name="OpenMetaverseTypes.dll"/>
878 <Reference name="OpenMetaverse.dll"/> 878 <Reference name="OpenMetaverse.dll"/>
879 <Reference name="OpenSim.Framework"/> 879 <Reference name="OpenSim.Framework"/>
880 <Reference name="OpenSim.Data" /> 880 <Reference name="OpenSim.Data"/>
881 <Reference name="OpenSim.Region.Interfaces" /> 881 <Reference name="OpenSim.Region.Interfaces"/>
882 <Reference name="OpenSim.Region.Environment" /> 882 <Reference name="OpenSim.Region.Environment"/>
883 <Reference name="OpenSim.Framework.Communications"/>
883 <Reference name="OpenSim.Framework.Console"/> 884 <Reference name="OpenSim.Framework.Console"/>
884 <Reference name="OpenSim.Framework.Servers"/> 885 <Reference name="OpenSim.Framework.Servers"/>
885 <Reference name="OpenSim.Framework.Statistics"/> 886 <Reference name="OpenSim.Framework.Statistics"/>