From 528cc8136e567b5bac583728fbb0235baaba2f02 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 15 Oct 2011 02:54:43 +0100
Subject: fetch physical_prim switch from [Startup] config from inside scene,
 as is done for most other scene config params

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index a6ffe6e..7295a38 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -73,8 +73,12 @@ namespace OpenSim.Region.Framework.Scenes
         public List<Border> SouthBorders = new List<Border>();
         public List<Border> WestBorders = new List<Border>();
 
-        /// <summary>Are we applying physics to any of the prims in this scene?</summary>
+        /// <summary>
+        /// Controls whether physics can be applied to prims.  Even if false, prims still have entries in a
+        /// PhysicsScene in order to perform collision detection
+        /// </summary>
         public bool m_physicalPrim;
+
         public float m_maxNonphys = 256;
         public float m_maxPhys = 10;
         public bool m_clampPrimSize;
@@ -533,7 +537,7 @@ namespace OpenSim.Region.Framework.Scenes
         public Scene(RegionInfo regInfo, AgentCircuitManager authen,
                      SceneCommunicationService sceneGridService,
                      ISimulationDataService simDataService, IEstateDataService estateDataService,
-                     ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim,
+                     ModuleLoader moduleLoader, bool dumpAssetsToFile,
                      bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion)
             : this(regInfo)
         {
@@ -550,8 +554,7 @@ namespace OpenSim.Region.Framework.Scenes
             m_EstateDataService = estateDataService;
             m_regionHandle = m_regInfo.RegionHandle;
             m_regionName = m_regInfo.RegionName;
-
-            m_physicalPrim = physicalPrim;
+            
             m_seeIntoRegionFromNeighbor = SeeIntoRegionFromNeighbor;
 
             m_asyncSceneObjectDeleter = new AsyncSceneObjectGroupDeleter(this);
@@ -676,6 +679,8 @@ namespace OpenSim.Region.Framework.Scenes
                 // TODO: Change default to true once the feature is supported
                 m_usePreJump = startupConfig.GetBoolean("enableprejump", false);
 
+                m_physicalPrim = startupConfig.GetBoolean("physical_prim", true);
+
                 m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys);
                 if (RegionInfo.NonphysPrimMax > 0)
                 {
-- 
cgit v1.1