aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Common/Mock
diff options
context:
space:
mode:
authorDan Lake2013-02-06 16:45:47 -0800
committerDan Lake2013-02-06 16:45:47 -0800
commit7590ebc934477d0c410cae1bbc40664453d57001 (patch)
treeabcb69bf2b26d23454a37af8609711376b6f1dee /OpenSim/Tests/Common/Mock
parentWebStats will now use actual logfile as specified in OpenSim.exe.config rathe... (diff)
parentminor: add method doc to DAMap.ValidateKey() (diff)
downloadopensim-SC_OLD-7590ebc934477d0c410cae1bbc40664453d57001.zip
opensim-SC_OLD-7590ebc934477d0c410cae1bbc40664453d57001.tar.gz
opensim-SC_OLD-7590ebc934477d0c410cae1bbc40664453d57001.tar.bz2
opensim-SC_OLD-7590ebc934477d0c410cae1bbc40664453d57001.tar.xz
Merge branch 'master' of git://opensimulator.org/git/opensim
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