Merge commit '3843efe478ed682fd08bf12ea8bd7377c68a36fb' into bigmerge

1 files changed, 6 insertions, 0 deletions

diff --git a/OpenSim/Framework/ConfigSettings.cs b/OpenSim/Framework/ConfigSettings.cs
index b0bdebe..6ee7fee 100644
--- a/OpenSim/Framework/ConfigSettings.cs
+++ b/OpenSim/Framework/ConfigSettings.cs
@@ -34,7 +34,13 @@ namespace OpenSim.Framework
         public bool   See_into_region_from_neighbor { get; set; }
         public string StorageDll                    { get; set; }
         public string ClientstackDll                { get; set; }
+
+        /// <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   PhysicalPrim                  { get; set; }
+        
         public string LibrariesXMLFile              { get; set; }
 
         public const uint DefaultRegionHttpPort = 9000;