From 27fda6c35fb9a965799a3e723aa516bbadeac582 Mon Sep 17 00:00:00 2001 From: "Eric M. Tulla (BigPapi)" Date: Thu, 17 Dec 2009 13:40:57 -0500 Subject: EXT-2636: we now show "Loading..." before the my inventory named folder when doing a background fetch. --- indra/newview/llfolderview.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llfolderview.cpp') diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index 321982ceb6..0be3371172 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -330,6 +330,7 @@ BOOL LLFolderView::addFolder( LLFolderViewFolder* folder) else { mFolders.insert(mFolders.begin(), folder); + folder->setShowLoadStatus(true); } folder->setOrigin(0, 0); folder->reshape(getRect().getWidth(), 0); -- cgit v1.2.3 From 3c38c7f14869f803538bcb87a109f26fecc9d107 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Thu, 17 Dec 2009 15:21:14 -0500 Subject: EXT-1634 : Block collapse/expand of accordion "root" folder by keyword Hidden folders are no longer allowed to be selected. --HG-- branch : avatar-pipeline --- indra/newview/llfolderview.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indra/newview/llfolderview.cpp') diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index adf7f08702..640b0d7d8f 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -748,6 +748,12 @@ void LLFolderView::sanitizeSelection() } } } + + // Don't allow invisible items (such as root folders) to be selected. + if (item->getDontShowInHierarchy()) + { + items_to_remove.push_back(item); + } } std::vector::iterator item_it; -- cgit v1.2.3