diff options
author | Justin Clarke Casey | 2008-11-11 21:31:39 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-11-11 21:31:39 +0000 |
commit | 70ad3ecd5e23dc442ae7c70cdb532298d9901045 (patch) | |
tree | ea92fa3911825c7a15075c3463b689622e359a3e /OpenSim/Region | |
parent | * Put an Enabled switch on the async object deleter for future testing purposes (diff) | |
download | opensim-SC-70ad3ecd5e23dc442ae7c70cdb532298d9901045.zip opensim-SC-70ad3ecd5e23dc442ae7c70cdb532298d9901045.tar.gz opensim-SC-70ad3ecd5e23dc442ae7c70cdb532298d9901045.tar.bz2 opensim-SC-70ad3ecd5e23dc442ae7c70cdb532298d9901045.tar.xz |
* Create TestScene to get at the async object deleter for use in a future test
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Tests/TestScene.cs | 55 |
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 | |||
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 | |||
28 | using Nini.Config; | ||
29 | using OpenSim.Framework; | ||
30 | using OpenSim.Framework.Communications; | ||
31 | using OpenSim.Framework.Communications.Cache; | ||
32 | using OpenSim.Framework.Servers; | ||
33 | using OpenSim.Region.Environment.Scenes; | ||
34 | |||
35 | namespace 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 | } | ||