summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Mutavchi <emutavchi@productengine.com>2010-02-15 22:07:38 +0200
committerEugene Mutavchi <emutavchi@productengine.com>2010-02-15 22:07:38 +0200
commitef21d64c84a7dd1382ac0da1f14c7707351373fa (patch)
tree1ea2965e7a7eea82e64dc1cf2a751018a10619b0
parentba68a7c8a04a05cd9cb5a94cb563c620ce13c750 (diff)
Fixed normal bug EXT-5328 (Focus is lost after LEFT arrow button has been pressed in Landmarks tab)
--HG-- branch : product-engine
-rw-r--r--indra/newview/llfolderview.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index 3230402bdc..d053933dfb 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -1625,7 +1625,11 @@ BOOL LLFolderView::handleKeyHere( KEY key, MASK mask )
LLFolderViewItem* parent_folder = last_selected->getParentFolder();
if (!last_selected->isOpen() && parent_folder && parent_folder->getParentFolder())
{
- setSelection(parent_folder, FALSE, TRUE);
+ // Don't change selectin to hidden folder. See EXT-5328.
+ if (!parent_folder->getHidden())
+ {
+ setSelection(parent_folder, FALSE, TRUE);
+ }
}
else
{