From ddf54b5537f2701deeb615ef8e1eeef20b746ea1 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Sat, 15 Oct 2011 03:03:05 +0100 Subject: move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with the others --- OpenSim/Framework/ConfigSettings.cs | 5 ----- OpenSim/Region/Application/ConfigurationLoader.cs | 3 --- OpenSim/Region/Application/OpenSimBase.cs | 2 +- OpenSim/Region/Framework/Scenes/Scene.cs | 5 ++--- OpenSim/Tests/Common/Helpers/SceneHelpers.cs | 2 +- OpenSim/Tests/Common/Mock/TestScene.cs | 8 ++++---- 6 files changed, 8 insertions(+), 17 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Framework/ConfigSettings.cs b/OpenSim/Framework/ConfigSettings.cs index 2768f70..002a371 100644 --- a/OpenSim/Framework/ConfigSettings.cs +++ b/OpenSim/Framework/ConfigSettings.cs @@ -31,13 +31,8 @@ namespace OpenSim.Framework { public string PhysicsEngine { get; set; } public string MeshEngineName { get; set; } - public bool See_into_region_from_neighbor { get; set; } public string StorageDll { get; set; } public string ClientstackDll { get; set; } - - - public bool PhysicalPrim { get; set; } - public string LibrariesXMLFile { get; set; } public const uint DefaultRegionHttpPort = 9000; diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs index b496108..d0f6ab7 100644 --- a/OpenSim/Region/Application/ConfigurationLoader.cs +++ b/OpenSim/Region/Application/ConfigurationLoader.cs @@ -362,9 +362,6 @@ namespace OpenSim { m_configSettings.PhysicsEngine = startupConfig.GetString("physics"); m_configSettings.MeshEngineName = startupConfig.GetString("meshing"); - - m_configSettings.See_into_region_from_neighbor = startupConfig.GetBoolean("see_into_this_sim_from_neighbor", true); - m_configSettings.StorageDll = startupConfig.GetString("storage_plugin"); m_configSettings.ClientstackDll diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 19329dd..553786b 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs @@ -660,7 +660,7 @@ namespace OpenSim return new Scene( regionInfo, circuitManager, sceneGridService, simDataService, estateDataService, m_moduleLoader, false, - m_configSettings.See_into_region_from_neighbor, m_config.Source, m_version); + m_config.Source, m_version); } protected void ShutdownClientServer(RegionInfo whichRegion) diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 7295a38..5876da9 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -538,7 +538,7 @@ namespace OpenSim.Region.Framework.Scenes SceneCommunicationService sceneGridService, ISimulationDataService simDataService, IEstateDataService estateDataService, ModuleLoader moduleLoader, bool dumpAssetsToFile, - bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) + IConfigSource config, string simulatorVersion) : this(regInfo) { m_config = config; @@ -554,8 +554,6 @@ namespace OpenSim.Region.Framework.Scenes m_EstateDataService = estateDataService; m_regionHandle = m_regInfo.RegionHandle; m_regionName = m_regInfo.RegionName; - - m_seeIntoRegionFromNeighbor = SeeIntoRegionFromNeighbor; m_asyncSceneObjectDeleter = new AsyncSceneObjectGroupDeleter(this); m_asyncSceneObjectDeleter.Enabled = true; @@ -703,6 +701,7 @@ namespace OpenSim.Region.Framework.Scenes m_clampPrimSize = true; } + m_seeIntoRegionFromNeighbor = startupConfig.GetBoolean("see_into_this_sim_from_neighbor", true); m_trustBinaries = startupConfig.GetBoolean("TrustBinaries", m_trustBinaries); m_allowScriptCrossings = startupConfig.GetBoolean("AllowScriptCrossing", m_allowScriptCrossings); m_dontPersistBefore = 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) { } /// /// Temporarily override session authentication for tests (namely teleport). /// - /// + /// /// TODO: This needs to be mocked out properly. - /// + /// /// /// public override bool VerifyUserPresence(AgentCircuitData agent, out string reason) -- cgit v1.1