diff options
| author | Melanie | 2011-10-25 02:14:39 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-25 02:14:39 +0100 |
| commit | 353f0c0e03499453dbeb2e39a85fcc99788fedf2 (patch) | |
| tree | 29fd038531f3b60b8d034edf8b4a2808f78cb70d /OpenSim/Tests/Common/Mock | |
| parent | Merge (diff) | |
| parent | move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with t... (diff) | |
| download | opensim-SC_OLD-353f0c0e03499453dbeb2e39a85fcc99788fedf2.zip opensim-SC_OLD-353f0c0e03499453dbeb2e39a85fcc99788fedf2.tar.gz opensim-SC_OLD-353f0c0e03499453dbeb2e39a85fcc99788fedf2.tar.bz2 opensim-SC_OLD-353f0c0e03499453dbeb2e39a85fcc99788fedf2.tar.xz | |
Merge commit 'ddf54b5537f2701deeb615ef8e1eeef20b746ea1' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Tests/Common/Mock')
| -rw-r--r-- | OpenSim/Tests/Common/Mock/TestScene.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs index f0e65c5..07bcdce 100644 --- a/OpenSim/Tests/Common/Mock/TestScene.cs +++ b/OpenSim/Tests/Common/Mock/TestScene.cs | |||
| @@ -42,18 +42,18 @@ namespace OpenSim.Tests.Common.Mock | |||
| 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 | ModuleLoader moduleLoader, bool dumpAssetsToFile, | 44 | ModuleLoader moduleLoader, bool dumpAssetsToFile, |
| 45 | bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) | 45 | IConfigSource config, string simulatorVersion) |
| 46 | : base(regInfo, authen, sceneGridService, simDataService, estateDataService, moduleLoader, | 46 | : base(regInfo, authen, sceneGridService, simDataService, estateDataService, moduleLoader, |
| 47 | dumpAssetsToFile, SeeIntoRegionFromNeighbor, config, simulatorVersion) | 47 | dumpAssetsToFile, config, simulatorVersion) |
| 48 | { | 48 | { |
| 49 | } | 49 | } |
| 50 | 50 | ||
| 51 | /// <summary> | 51 | /// <summary> |
| 52 | /// Temporarily override session authentication for tests (namely teleport). | 52 | /// Temporarily override session authentication for tests (namely teleport). |
| 53 | /// </summary> | 53 | /// </summary> |
| 54 | /// | 54 | /// <remarks> |
| 55 | /// TODO: This needs to be mocked out properly. | 55 | /// TODO: This needs to be mocked out properly. |
| 56 | /// | 56 | /// </remarks> |
| 57 | /// <param name="agent"></param> | 57 | /// <param name="agent"></param> |
| 58 | /// <returns></returns> | 58 | /// <returns></returns> |
| 59 | public override bool VerifyUserPresence(AgentCircuitData agent, out string reason) | 59 | public override bool VerifyUserPresence(AgentCircuitData agent, out string reason) |