move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with the others
parent
a2c9b3d83d
commit
250eed5141
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -533,7 +533,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;
|
||||
|
@ -549,8 +549,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;
|
||||
|
@ -698,6 +696,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 =
|
||||
|
|
|
@ -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());
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue