Merge branch 'justincc-master'

2026-08-12 04:05:42 +08:00 · 2014-01-10 20:19:38 +00:00
parent 32e9c16957 88f01a4130
commit 5e72de1908
8 changed files with 238 additions and 143 deletions
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -109,6 +109,9 @@ namespace OpenSim.Region.Framework.Scenes
            STATUS_ROTATE_Z = 0x008,
        }

+        // This flag has the same purpose as InventoryItemFlags.ObjectSlamPerm
+        public static readonly uint SLAM = 16;
+
        // private PrimCountTaintedDelegate handlerPrimCountTainted = null;

        /// <summary>