diff options
author | Merov Linden <merov@lindenlab.com> | 2012-03-01 13:31:17 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2012-03-01 13:31:17 -0800 |
commit | 24789f11cc58cf7c03283a8e9648085a5cb9d7d8 (patch) | |
tree | bade7e21ca009bdb6a9f89b155732876bb02035d /indra/newview/llfolderviewitem.cpp | |
parent | a7499dc4abfa5fa7582dc7ebb535a07ed94d0c4f (diff) | |
parent | 66f101bac591d82b71ab7dc976b6fed0ed451909 (diff) |
Pull from viewer-experience
Diffstat (limited to 'indra/newview/llfolderviewitem.cpp')
-rw-r--r-- | indra/newview/llfolderviewitem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp index 0b4baf52f9..712d3e4583 100644 --- a/indra/newview/llfolderviewitem.cpp +++ b/indra/newview/llfolderviewitem.cpp @@ -1046,7 +1046,7 @@ void LLFolderViewItem::draw() } if ((mIsLoading && mTimeSinceRequestStart.getElapsedTimeF32() >= gSavedSettings.getF32("FolderLoadingMessageWaitTime")) - || (LLInventoryModelBackgroundFetch::instance().backgroundFetchActive() + || (LLInventoryModelBackgroundFetch::instance().folderFetchActive() && root_is_loading && mShowLoadStatus)) { |