From 55b59bcceaafcc6539dd8947f4f3e2f2403e4dd0 Mon Sep 17 00:00:00 2001 From: Latif Khalifa Date: Mon, 8 Aug 2011 21:36:24 +0000 Subject: [PATCH] LIBOMV-921: IsAttachment Should be Preserved as Primitive Member Patch by Bennett Goble git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@3574 52acb1d6-8a22-11de-b505-999d5b087335 --- OpenMetaverse/ObjectManager.cs | 7 ++++--- OpenMetaverse/Primitives/Primitive.cs | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/OpenMetaverse/ObjectManager.cs b/OpenMetaverse/ObjectManager.cs index f17158d1..255cf08e 100644 --- a/OpenMetaverse/ObjectManager.cs +++ b/OpenMetaverse/ObjectManager.cs @@ -2000,6 +2000,7 @@ namespace OpenMetaverse prim.MediaURL = Utils.BytesToString(block.MediaURL); prim.Text = Utils.BytesToString(block.Text); prim.TextColor = new Color4(block.TextColor, 0, false, true); + prim.IsAttachment = attachment; // Sound information prim.Sound = block.Sound; @@ -2554,13 +2555,13 @@ namespace OpenMetaverse #endregion - #region Raise Events + prim.IsAttachment = (flags & CompressedFlags.HasNameValues) != 0 && prim.ParentID != 0; - bool isAttachment = (flags & CompressedFlags.HasNameValues) != 0 && prim.ParentID != 0; + #region Raise Events EventHandler handler = m_ObjectUpdate; if (handler != null) - handler(this, new PrimEventArgs(simulator, prim, update.RegionData.TimeDilation, isNew, isAttachment)); + handler(this, new PrimEventArgs(simulator, prim, update.RegionData.TimeDilation, isNew, prim.IsAttachment)); #endregion } diff --git a/OpenMetaverse/Primitives/Primitive.cs b/OpenMetaverse/Primitives/Primitive.cs index 15f79ec1..7b931b12 100644 --- a/OpenMetaverse/Primitives/Primitive.cs +++ b/OpenMetaverse/Primitives/Primitive.cs @@ -760,6 +760,8 @@ namespace OpenMetaverse public PhysicsProperties PhysicsProps; /// Extra data about primitive public object Tag; + /// Indicates if prim is attached to an avatar + public bool IsAttachment; #endregion Public Members