From 0dc944bd4a9aa48582ee0196a55c2759806acc64 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Mon, 30 Apr 2018 14:15:21 +0100
Subject: SL-908 - more reliable mesh highlighting

---
 indra/newview/llviewerobject.cpp | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 11d64ab13a..1cd50e3400 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -3010,11 +3010,20 @@ void LLViewerObject::linkControlAvatar()
                                      << " created control av for " 
                                      << (S32) (1+volp->numChildren()) << " prims" << LL_ENDL;
     }
-    if (getControlAvatar())
+    LLControlAvatar *cav = getControlAvatar();
+    if (cav)
     {
-        getControlAvatar()->updateAttachmentOverrides();
-        getControlAvatar()->updateAnimations();
-        getControlAvatar()->mPlaying = true;
+        cav->updateAttachmentOverrides();
+        cav->updateAnimations();
+        if (!cav->mPlaying)
+        {
+            cav->mPlaying = true;
+            if (!cav->mRootVolp->isAnySelected())
+            {
+                cav->updateVolumeGeom();
+                cav->mRootVolp->recursiveMarkForUpdate(TRUE);
+            }
+        }
     }
     else
     {
-- 
cgit v1.2.3