Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmerge

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs

1 files changed, 10 insertions, 2 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 03b5d36..4d8a759 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;
@@ -552,7 +556,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)
         {
@@ -574,6 +578,7 @@ namespace OpenSim.Region.Framework.Scenes
             m_lastOutgoing = 0;
 
             m_physicalPrim = physicalPrim;
+            
             m_seeIntoRegionFromNeighbor = SeeIntoRegionFromNeighbor;
 
             m_asyncSceneObjectDeleter = new AsyncSceneObjectGroupDeleter(this);
@@ -697,6 +702,9 @@ namespace OpenSim.Region.Framework.Scenes
                 m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false);
                 // TODO: Change default to true once the feature is supported
                 m_usePreJump = startupConfig.GetBoolean("enableprejump", true);
+
+                m_physicalPrim = startupConfig.GetBoolean("physical_prim", true);
+
                 m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys);
 
                 m_log.DebugFormat("[SCENE]: prejump is {0}", m_usePreJump ? "ON" : "OFF");