move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with the others

2 files changed, 5 insertions, 5 deletions

diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
index c64270f..d358ae8 100644
--- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
@@ -108,7 +108,7 @@ namespace OpenSim.Tests.Common
             IConfigSource configSource = new IniConfigSource();
 
             TestScene testScene = new TestScene(
-                regInfo, acm, scs, simDataService, estateDataService, null, false, false, configSource, null);
+                regInfo, acm, scs, simDataService, estateDataService, null, false, configSource, null);
 
             IRegionModule godsModule = new GodsModule();
             godsModule.Initialise(testScene, new IniConfigSource());
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
             RegionInfo regInfo, AgentCircuitManager authen,
             SceneCommunicationService sceneGridService, ISimulationDataService simDataService, IEstateDataService estateDataService,
             ModuleLoader moduleLoader, bool dumpAssetsToFile,
-            bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion)
+            IConfigSource config, string simulatorVersion)
             : base(regInfo, authen, sceneGridService, simDataService, estateDataService, moduleLoader,
-                   dumpAssetsToFile, SeeIntoRegionFromNeighbor, config, simulatorVersion)
+                   dumpAssetsToFile, config, simulatorVersion)
         {
         }
         
         /// <summary>
         /// Temporarily override session authentication for tests (namely teleport).
         /// </summary>
-        /// 
+        /// <remarks>
         /// TODO: This needs to be mocked out properly.
-        /// 
+        /// </remarks>
         /// <param name="agent"></param>
         /// <returns></returns>
         public override bool VerifyUserPresence(AgentCircuitData agent, out string reason)