aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-10-15 03:03:05 +0100
committerJustin Clark-Casey (justincc)2011-10-15 03:03:05 +0100
commitddf54b5537f2701deeb615ef8e1eeef20b746ea1 (patch)
tree96b274be466fda1c0056add9a66d6ea3715fdcd2
parentfetch physical_prim switch from [Startup] config from inside scene, as is don... (diff)
downloadopensim-SC_OLD-ddf54b5537f2701deeb615ef8e1eeef20b746ea1.zip
opensim-SC_OLD-ddf54b5537f2701deeb615ef8e1eeef20b746ea1.tar.gz
opensim-SC_OLD-ddf54b5537f2701deeb615ef8e1eeef20b746ea1.tar.bz2
opensim-SC_OLD-ddf54b5537f2701deeb615ef8e1eeef20b746ea1.tar.xz
move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with the others
-rw-r--r--OpenSim/Framework/ConfigSettings.cs5
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs3
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs5
-rw-r--r--OpenSim/Tests/Common/Helpers/SceneHelpers.cs2
-rw-r--r--OpenSim/Tests/Common/Mock/TestScene.cs8
6 files changed, 8 insertions, 17 deletions
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
31 { 31 {
32 public string PhysicsEngine { get; set; } 32 public string PhysicsEngine { get; set; }
33 public string MeshEngineName { get; set; } 33 public string MeshEngineName { get; set; }
34 public bool See_into_region_from_neighbor { get; set; }
35 public string StorageDll { get; set; } 34 public string StorageDll { get; set; }
36 public string ClientstackDll { get; set; } 35 public string ClientstackDll { get; set; }
37
38
39 public bool PhysicalPrim { get; set; }
40
41 public string LibrariesXMLFile { get; set; } 36 public string LibrariesXMLFile { get; set; }
42 37
43 public const uint DefaultRegionHttpPort = 9000; 38 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
362 { 362 {
363 m_configSettings.PhysicsEngine = startupConfig.GetString("physics"); 363 m_configSettings.PhysicsEngine = startupConfig.GetString("physics");
364 m_configSettings.MeshEngineName = startupConfig.GetString("meshing"); 364 m_configSettings.MeshEngineName = startupConfig.GetString("meshing");
365
366 m_configSettings.See_into_region_from_neighbor = startupConfig.GetBoolean("see_into_this_sim_from_neighbor", true);
367
368 m_configSettings.StorageDll = startupConfig.GetString("storage_plugin"); 365 m_configSettings.StorageDll = startupConfig.GetString("storage_plugin");
369 366
370 m_configSettings.ClientstackDll 367 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
660 return new Scene( 660 return new Scene(
661 regionInfo, circuitManager, sceneGridService, 661 regionInfo, circuitManager, sceneGridService,
662 simDataService, estateDataService, m_moduleLoader, false, 662 simDataService, estateDataService, m_moduleLoader, false,
663 m_configSettings.See_into_region_from_neighbor, m_config.Source, m_version); 663 m_config.Source, m_version);
664 } 664 }
665 665
666 protected void ShutdownClientServer(RegionInfo whichRegion) 666 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
538 SceneCommunicationService sceneGridService, 538 SceneCommunicationService sceneGridService,
539 ISimulationDataService simDataService, IEstateDataService estateDataService, 539 ISimulationDataService simDataService, IEstateDataService estateDataService,
540 ModuleLoader moduleLoader, bool dumpAssetsToFile, 540 ModuleLoader moduleLoader, bool dumpAssetsToFile,
541 bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) 541 IConfigSource config, string simulatorVersion)
542 : this(regInfo) 542 : this(regInfo)
543 { 543 {
544 m_config = config; 544 m_config = config;
@@ -554,8 +554,6 @@ namespace OpenSim.Region.Framework.Scenes
554 m_EstateDataService = estateDataService; 554 m_EstateDataService = estateDataService;
555 m_regionHandle = m_regInfo.RegionHandle; 555 m_regionHandle = m_regInfo.RegionHandle;
556 m_regionName = m_regInfo.RegionName; 556 m_regionName = m_regInfo.RegionName;
557
558 m_seeIntoRegionFromNeighbor = SeeIntoRegionFromNeighbor;
559 557
560 m_asyncSceneObjectDeleter = new AsyncSceneObjectGroupDeleter(this); 558 m_asyncSceneObjectDeleter = new AsyncSceneObjectGroupDeleter(this);
561 m_asyncSceneObjectDeleter.Enabled = true; 559 m_asyncSceneObjectDeleter.Enabled = true;
@@ -703,6 +701,7 @@ namespace OpenSim.Region.Framework.Scenes
703 m_clampPrimSize = true; 701 m_clampPrimSize = true;
704 } 702 }
705 703
704 m_seeIntoRegionFromNeighbor = startupConfig.GetBoolean("see_into_this_sim_from_neighbor", true);
706 m_trustBinaries = startupConfig.GetBoolean("TrustBinaries", m_trustBinaries); 705 m_trustBinaries = startupConfig.GetBoolean("TrustBinaries", m_trustBinaries);
707 m_allowScriptCrossings = startupConfig.GetBoolean("AllowScriptCrossing", m_allowScriptCrossings); 706 m_allowScriptCrossings = startupConfig.GetBoolean("AllowScriptCrossing", m_allowScriptCrossings);
708 m_dontPersistBefore = 707 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
108 IConfigSource configSource = new IniConfigSource(); 108 IConfigSource configSource = new IniConfigSource();
109 109
110 TestScene testScene = new TestScene( 110 TestScene testScene = new TestScene(
111 regInfo, acm, scs, simDataService, estateDataService, null, false, false, configSource, null); 111 regInfo, acm, scs, simDataService, estateDataService, null, false, configSource, null);
112 112
113 IRegionModule godsModule = new GodsModule(); 113 IRegionModule godsModule = new GodsModule();
114 godsModule.Initialise(testScene, new IniConfigSource()); 114 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
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)