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

1 files changed, 8 insertions, 0 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 1ac3b76..2e86315 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)
                     {