From c2586b0ea9f5abafa140ebae19c7660372283a5d Mon Sep 17 00:00:00 2001
From: Snoopy Pfeffer <snoopy.pfeffer@yahoo.com>
Date: Sun, 25 Sep 2011 00:51:43 +0200
Subject: [PATCH] Fix for rezzing and derezzing HUDs (see Mantis #5406). From
 now on updates are only sent to affected clients.

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

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 980b01fda0..234eb7d2ea 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1174,7 +1174,11 @@ namespace OpenSim.Region.Framework.Scenes
                     {
                         part.UpdateFlag = 0;
                         if (part == m_rootPart)
-                            avatar.ControllingClient.SendKillObject(m_regionHandle, part.LocalId);
+                        {
+                            if (!IsAttachment || (AttachedAvatar == avatar.ControllingClient.AgentId) || 
+                                (AttachmentPoint < 31) || (AttachmentPoint > 38))
+                                avatar.ControllingClient.SendKillObject(m_regionHandle, part.LocalId);
+                        }
                     }
                 });
             }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 632ac8fbf2..d631c12bfc 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2999,6 +2999,10 @@ namespace OpenSim.Region.Framework.Scenes
             if (ParentGroup.IsDeleted)
                 return;
 
+            if (ParentGroup.IsAttachment && (ParentGroup.AttachedAvatar != remoteClient.AgentId) &&
+                (ParentGroup.AttachmentPoint >= 31) && (ParentGroup.AttachmentPoint <= 38))
+                return;
+
             clientFlags &= ~(uint) PrimFlags.CreateSelected;
 
             if (remoteClient.AgentId == _ownerID)
@@ -4786,7 +4790,8 @@ namespace OpenSim.Region.Framework.Scenes
             if (ParentGroup.IsDeleted)
                 return;
 
-            if (ParentGroup.IsAttachment && ParentGroup.RootPart != this)
+            if (ParentGroup.IsAttachment && ((ParentGroup.RootPart != this) ||
+                ((ParentGroup.AttachedAvatar != remoteClient.AgentId) && (ParentGroup.AttachmentPoint >= 31) && (ParentGroup.AttachmentPoint <= 38))))
                 return;
             
             // Causes this thread to dig into the Client Thread Data.