From dd9b06e3b68919f9b093c7673427c4beeb1fb1ea Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Thu, 29 Oct 2015 22:14:11 +0000
Subject: fix mantis 7733, reverting setting of IsAttachment on first call to
 full check. Replace instead same simple IsAttachment tests by full checks

---
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 8 ++------
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs  | 7 ++++---
 2 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 1d89267..f3b3a9c 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -447,12 +447,8 @@ namespace OpenSim.Region.Framework.Scenes
         /// <returns></returns>
         public bool IsAttachmentCheckFull()
         {
-            if(IsAttachment)
-                return true;
-
-            IsAttachment = (m_rootPart.Shape.PCode == (byte)PCodeEnum.Primitive && m_rootPart.Shape.State != 0);
-
-            return IsAttachment;
+            return (IsAttachment ||
+                (m_rootPart.Shape.PCode == (byte)PCodeEnum.Primitive && m_rootPart.Shape.State != 0));
         }
         
         private struct avtocrossInfo
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 25aa83f..d1c5f72 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1753,8 +1753,9 @@ namespace OpenSim.Region.Framework.Scenes
             }
             else
             {
-                if ((!isPhantom || isPhysical || _VolumeDetectActive) && !ParentGroup.IsAttachment
-                                                && !(Shape.PathCurve == (byte)Extrusion.Flexible))
+                if ((!isPhantom || isPhysical || _VolumeDetectActive)
+                        && !ParentGroup.IsAttachmentCheckFull()
+                        && !(Shape.PathCurve == (byte)Extrusion.Flexible))
                 {
                     AddToPhysics(isPhysical, isPhantom, isPhysical);
                 }
@@ -4241,7 +4242,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
 
             if (SetPhantom
-                || ParentGroup.IsAttachment
+                || ParentGroup.IsAttachmentCheckFull()
                 || PhysicsShapeType == (byte)PhysShapeType.none
                 || (Shape.PathCurve == (byte)Extrusion.Flexible)) // note: this may have been changed above in the case of joints
             {
-- 
cgit v1.1