Merge commit '3843efe478ed682fd08bf12ea8bd7377c68a36fb' into bigmerge

2026-08-08 02:05:34 +08:00 · 2011-10-25 01:53:53 +01:00
parent 9dd7d9c16c 3843efe478
commit 8841b77cd1
3 changed files with 14 additions and 2 deletions
--- 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;