diff options
author | onefang | 2019-09-11 16:36:50 +1000 |
---|---|---|
committer | onefang | 2019-09-11 16:36:50 +1000 |
commit | 50cd1ffd32f69228e566f2b0b89f86ea0d9fe489 (patch) | |
tree | 52f2ab0c04f1a5d7d6ac5dc872981b4b156447e7 /OpenSim/Tests/Common/Mock/TestScene.cs | |
parent | Renamed branch to SledjChisl. (diff) | |
parent | Bump to release flavour, build 0. (diff) | |
download | opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.zip opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.gz opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.bz2 opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.xz |
Merge branch 'SledjChisl'
Diffstat (limited to 'OpenSim/Tests/Common/Mock/TestScene.cs')
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestScene.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs index 1a93c9f..0b3d446 100644 --- a/OpenSim/Tests/Common/Mock/TestScene.cs +++ b/OpenSim/Tests/Common/Mock/TestScene.cs | |||
@@ -41,7 +41,7 @@ namespace OpenSim.Tests.Common | |||
41 | public class TestScene : Scene | 41 | public class TestScene : Scene |
42 | { | 42 | { |
43 | public TestScene( | 43 | public TestScene( |
44 | RegionInfo regInfo, AgentCircuitManager authen, | 44 | RegionInfo regInfo, AgentCircuitManager authen, |
45 | ISimulationDataService simDataService, IEstateDataService estateDataService, | 45 | ISimulationDataService simDataService, IEstateDataService estateDataService, |
46 | IConfigSource config, string simulatorVersion) | 46 | IConfigSource config, string simulatorVersion) |
47 | : base(regInfo, authen, simDataService, estateDataService, | 47 | : base(regInfo, authen, simDataService, estateDataService, |
@@ -54,7 +54,7 @@ namespace OpenSim.Tests.Common | |||
54 | //Console.WriteLine("TestScene destructor called for {0}", RegionInfo.RegionName); | 54 | //Console.WriteLine("TestScene destructor called for {0}", RegionInfo.RegionName); |
55 | Console.WriteLine("TestScene destructor called"); | 55 | Console.WriteLine("TestScene destructor called"); |
56 | } | 56 | } |
57 | 57 | ||
58 | /// <summary> | 58 | /// <summary> |
59 | /// Temporarily override session authentication for tests (namely teleport). | 59 | /// Temporarily override session authentication for tests (namely teleport). |
60 | /// </summary> | 60 | /// </summary> |
@@ -68,7 +68,7 @@ namespace OpenSim.Tests.Common | |||
68 | reason = String.Empty; | 68 | reason = String.Empty; |
69 | return true; | 69 | return true; |
70 | } | 70 | } |
71 | 71 | ||
72 | public AsyncSceneObjectGroupDeleter SceneObjectGroupDeleter | 72 | public AsyncSceneObjectGroupDeleter SceneObjectGroupDeleter |
73 | { | 73 | { |
74 | get { return m_asyncSceneObjectDeleter; } | 74 | get { return m_asyncSceneObjectDeleter; } |