merge

1 files changed, 3 insertions, 6 deletions

diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index b7165f68b7..ad18adddd5 100755
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -506,13 +506,10 @@ BOOL LLFolderViewItem::handleMouseDown( S32 x, S32 y, MASK mask )
 		}
 		make_ui_sound("UISndClick");
 	}
-    //Just re-select the item since it is clicked without ctrl or shift
-    else if(!(mask & (MASK_CONTROL | MASK_SHIFT)))
-    {
-        getRoot()->setSelection(this, FALSE);
-    }
 	else
 	{
+		// If selected, we reserve the decision of deselecting/reselecting to the mouse up moment.
+		// This is necessary so we maintain selection consistent when starting a drag.
 		mSelectPending = TRUE;
 	}
 
@@ -739,7 +736,7 @@ void LLFolderViewItem::drawHighlight(const BOOL showContent, const BOOL hasKeybo
                 getRect().getWidth() - 2,
                 0,
                 focusOutlineColor, FALSE);
-            if (showContent)
+            if (showContent && !isFlashing())
             {
                 gl_rect_2d(FOCUS_LEFT,
                     focus_bottom + 1,