Merge branch 'master' into careminster

2026-08-06 01:06:30 +08:00 · 2011-12-23 01:00:34 +00:00
parent eef6f92029 456c89a7a3
commit b8a914b15b
4 changed files with 81 additions and 26 deletions
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -273,7 +273,7 @@ namespace OpenSim.Region.Framework.Scenes
        /// </remarks>
        public bool UsesPhysics
        {
-            get { return (RootPart.Flags & PrimFlags.TemporaryOnRez) != 0; }
+            get { return (RootPart.Flags & PrimFlags.Physics) != 0; }
        }

        /// <summary>