SL-1291 - fixed some issues with selection highlighting of objects rezzed while in build mode. Not clear whether this addresses the original issue, which isn't reproing

1 files changed, 5 insertions, 1 deletions

diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index f963f8a0c8..dcd09f66c7 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -3015,6 +3015,10 @@ void LLViewerObject::updateControlAvatar()
     if (getControlAvatar())
     {
         getControlAvatar()->updateAnimations();
+        if (isSelected())
+        {
+            LLSelectMgr::getInstance()->pauseAssociatedAvatars();
+        }
     }
 }
 
@@ -3040,7 +3044,7 @@ void LLViewerObject::linkControlAvatar()
         if (!cav->mPlaying)
         {
             cav->mPlaying = true;
-            if (!cav->mRootVolp->isAnySelected())
+            //if (!cav->mRootVolp->isAnySelected())
             {
                 cav->updateVolumeGeom();
                 cav->mRootVolp->recursiveMarkForUpdate(TRUE);