From dc835717d66678eddfd802717a068c6131e460fc Mon Sep 17 00:00:00 2001
From: Melanie <melanie@t-data.com>
Date: Thu, 23 Feb 2012 14:08:35 +0100
Subject: [PATCH] Properly sequence updates of avatars and attachments so that
 we don't update attachments on child avatars or intermingle agent and
 attachment updates, which would render the root prim of huds invisible

---
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 8 ++++++++
 OpenSim/Region/Framework/Scenes/ScenePresence.cs      | 3 +++
 2 files changed, 11 insertions(+)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 1ac3b76350..2e86315aaa 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -3774,6 +3774,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         // doesn't seem to be attached, skip
                         if (!found)
                             continue;
+
+                        // On vehicle crossing, the attachments are received
+                        // while the avatar is still a child. Don't send
+                        // updates here because the LocalId has not yet
+                        // been updated and the viewer will derender the
+                        // attachments until the avatar becomes root.
+                        if (sp.IsChildAgent)
+                            continue;
                     }
                     if (part.ParentGroup.IsAttachment && m_disableFacelights)
                     {
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index a3839c2501..2c118d6eef 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -984,6 +984,7 @@ namespace OpenSim.Region.Framework.Scenes
                     Util.FireAndForget(delegate(object x) {
                         foreach (SceneObjectGroup sog in m_attachments)
                         {
+                            sog.ScheduleGroupForFullUpdate();
                             sog.RootPart.ParentGroup.CreateScriptInstances(0, false, m_scene.DefaultScriptEngine, GetStateSource());
                             sog.ResumeScripts();
                         }
@@ -991,6 +992,8 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
 
+            SendAvatarDataToAllAgents();
+
             // send the animations of the other presences to me
             m_scene.ForEachRootScenePresence(delegate(ScenePresence presence)
             {