aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Common/Mock
diff options
context:
space:
mode:
authorMelanie2013-02-06 02:38:30 +0000
committerMelanie2013-02-06 02:38:30 +0000
commitd8c27de39596e1ec18c2e239d552dcc6787f4477 (patch)
tree800b96b1146a920faf0b258012942ad9a0341d21 /OpenSim/Tests/Common/Mock
parentMerge branch 'master' into careminster (diff)
parentminor: Add explanation of MaptileStaticUUID setting in Regions.ini.example (diff)
downloadopensim-SC-d8c27de39596e1ec18c2e239d552dcc6787f4477.zip
opensim-SC-d8c27de39596e1ec18c2e239d552dcc6787f4477.tar.gz
opensim-SC-d8c27de39596e1ec18c2e239d552dcc6787f4477.tar.bz2
opensim-SC-d8c27de39596e1ec18c2e239d552dcc6787f4477.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Tests/Common/Mock')
-rw-r--r--OpenSim/Tests/Common/Mock/TestScene.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs
index d4b5648..a7e0dfb 100644
--- a/OpenSim/Tests/Common/Mock/TestScene.cs
+++ b/OpenSim/Tests/Common/Mock/TestScene.cs
@@ -41,10 +41,9 @@ namespace OpenSim.Tests.Common.Mock
41 public TestScene( 41 public TestScene(
42 RegionInfo regInfo, AgentCircuitManager authen, 42 RegionInfo regInfo, AgentCircuitManager authen,
43 SceneCommunicationService sceneGridService, ISimulationDataService simDataService, IEstateDataService estateDataService, 43 SceneCommunicationService sceneGridService, ISimulationDataService simDataService, IEstateDataService estateDataService,
44 bool dumpAssetsToFile,
45 IConfigSource config, string simulatorVersion) 44 IConfigSource config, string simulatorVersion)
46 : base(regInfo, authen, sceneGridService, simDataService, estateDataService, 45 : base(regInfo, authen, sceneGridService, simDataService, estateDataService,
47 dumpAssetsToFile, config, simulatorVersion) 46 config, simulatorVersion)
48 { 47 {
49 } 48 }
50 49