diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-07-05 16:07:09 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-07-05 16:07:09 -0700 |
| commit | 72c7525e677b8e5391abf5b552aa8d068f0e82d6 (patch) | |
| tree | ec551396ee7dcc299f8869d551ed3139190b2df0 /indra/newview/llfolderview.cpp | |
| parent | 2f21ec48a222662351c9f8e7243673eb6a31b457 (diff) | |
EXP-916 FIX -- Folder in Inbox indicates loading when all items are displayed in folder
* Updated inbox inventory to not ever display the loading status like other inventory windows.
* show_load_status is now an optional parameter for LLInventoryPanel and LLFolderView. Its
default value is true but it is overridden to be false for the LLInboxInventoryPanel.
Reviewed by Richard.
Diffstat (limited to 'indra/newview/llfolderview.cpp')
| -rw-r--r-- | indra/newview/llfolderview.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index bfbe8ac96e..b04ab493bf 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -172,6 +172,7 @@ LLFolderView::Params::Params() title("title"), use_label_suffix("use_label_suffix"), allow_multiselect("allow_multiselect", true), + show_load_status("show_load_status", true), use_ellipses("use_ellipses", false) { } @@ -208,6 +209,8 @@ LLFolderView::LLFolderView(const Params& p) mStatusTextBox(NULL) { mRoot = this; + + mShowLoadStatus = p.show_load_status(); LLRect rect = p.rect; LLRect new_rect(rect.mLeft, rect.mBottom + getRect().getHeight(), rect.mLeft + getRect().getWidth(), rect.mBottom); @@ -354,7 +357,7 @@ BOOL LLFolderView::addFolder( LLFolderViewFolder* folder) { recursiveIncrementNumDescendantsSelected(folder->numSelected()); } - folder->setShowLoadStatus(true); + folder->setShowLoadStatus(mShowLoadStatus); folder->setOrigin(0, 0); folder->reshape(getRect().getWidth(), 0); folder->setVisible(FALSE); |