diff options
| author | skolb <none@none> | 2009-12-17 11:39:35 -0800 |
|---|---|---|
| committer | skolb <none@none> | 2009-12-17 11:39:35 -0800 |
| commit | 967652a7059cd1434ec593d8d3022f8b8e6cf10c (patch) | |
| tree | 6c1be7baac8c7583f9e4fcf66ff4410bf5454f8f /indra/newview/llfolderviewitem.cpp | |
| parent | c9a70e867535e734b7f1e55c5b2234cb2bb1691d (diff) | |
| parent | 39700f104b8e258cc9b9f8138ae73a0c96213b0a (diff) | |
Merge
Diffstat (limited to 'indra/newview/llfolderviewitem.cpp')
| -rw-r--r-- | indra/newview/llfolderviewitem.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp index 135821f662..8a13964708 100644 --- a/indra/newview/llfolderviewitem.cpp +++ b/indra/newview/llfolderviewitem.cpp @@ -136,7 +136,8 @@ LLFolderViewItem::LLFolderViewItem(LLFolderViewItem::Params p) mListener(p.listener), mArrowImage(p.folder_arrow_image), mBoxImage(p.selection_image), - mDontShowInHierarchy(false) + mDontShowInHierarchy(false), + mShowLoadStatus(false) { refresh(); } @@ -966,10 +967,11 @@ void LLFolderViewItem::draw() } - if ( mIsLoading - && mTimeSinceRequestStart.getElapsedTimeF32() >= gSavedSettings.getF32("FolderLoadingMessageWaitTime") ) + if ( (mIsLoading && mTimeSinceRequestStart.getElapsedTimeF32() >= gSavedSettings.getF32("FolderLoadingMessageWaitTime")) + || (LLInventoryModel::backgroundFetchActive() && mShowLoadStatus) ) { - font->renderUTF8(LLTrans::getString("LoadingData"), 0, text_left, y, sSearchStatusColor, + std::string load_string = LLTrans::getString("LoadingData") + " "; + font->renderUTF8(load_string, 0, text_left, y, sSearchStatusColor, LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, &right_x, FALSE); text_left = right_x; } |