From 9ebd99d8ae5f1939a1fe48349820c7c6ed6c06a4 Mon Sep 17 00:00:00 2001 From: Sergei Litovchuk Date: Mon, 15 Feb 2010 20:57:34 +0200 Subject: Fixed low bug (EXT-5251) Status text isn't aligned to top in inventory SP - Changed status textbox rect in folder view. --HG-- branch : product-engine --- indra/newview/llfolderview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llfolderview.cpp') diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index 8dbdfff635..3230402bdc 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -234,7 +234,7 @@ LLFolderView::LLFolderView(const Params& p) // Textbox LLTextBox::Params text_p; - LLRect new_r(5, 13-50, 300, 0-50); + LLRect new_r(5, 40, 300, 40-13); text_p.name(std::string(p.name)); text_p.rect(new_r); text_p.font(getLabelFontForStyle(mLabelStyle)); -- cgit v1.2.3 From ef21d64c84a7dd1382ac0da1f14c7707351373fa Mon Sep 17 00:00:00 2001 From: Eugene Mutavchi Date: Mon, 15 Feb 2010 22:07:38 +0200 Subject: Fixed normal bug EXT-5328 (Focus is lost after LEFT arrow button has been pressed in Landmarks tab) --HG-- branch : product-engine --- indra/newview/llfolderview.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'indra/newview/llfolderview.cpp') 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 { -- cgit v1.2.3