Merge branch 'master' into careminster-presence-refactor

2026-08-04 16:22:50 +08:00 · 2010-08-07 05:41:41 +01:00
parent c554de7501 a04efe4a4d
commit 8fd3f6cf7f
23 changed files with 27795 additions and 27780 deletions
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1182,6 +1182,10 @@ namespace OpenSim.Region.Framework.Scenes
            set { _nextOwnerMask = value; }
        }

+        /// <summary>
+        /// Property flags.  See OpenMetaverse.PrimFlags 
+        /// </summary>      
+        /// Example properties are PrimFlags.Phantom and PrimFlags.DieAtEdge
        public PrimFlags Flags
        {
            get { return _flags; }