diff options
author | Merov Linden <merov@lindenlab.com> | 2013-01-10 11:49:29 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2013-01-10 11:49:29 -0800 |
commit | 45e72bf3cbd08eef96663d569cec3ecae198a8e4 (patch) | |
tree | e8012159fce4a47487f869a0345815a6656a4d88 /indra/llui/llfolderviewitem.cpp | |
parent | b5b44ddf175e46379aa20b79b0abedab6bc05e2e (diff) | |
parent | f5a2929d8f8ba3adb3a78c2c28775a388caa7c44 (diff) |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/llui/llfolderviewitem.cpp')
-rwxr-xr-x | indra/llui/llfolderviewitem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp index 6d3b883b09..f67c134751 100755 --- a/indra/llui/llfolderviewitem.cpp +++ b/indra/llui/llfolderviewitem.cpp @@ -736,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, |