diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-12-05 10:39:35 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-12-05 10:39:35 -0500 |
| commit | 744cf6be8d5a808020a4d6cc98ff4c6b208239c0 (patch) | |
| tree | fab4ec7a30752ef1087d15540899830bf766cb89 /indra/newview/llinventorybridge.cpp | |
| parent | 1320e5ddcd9fc3be526dcacbf4710f8bcf878665 (diff) | |
| parent | 787ccaf297e81291469aaf269f563d862fb150a3 (diff) | |
merge
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rwxr-xr-x | indra/newview/llinventorybridge.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index fbb276efd6..32164f3a72 100755 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -2970,7 +2970,7 @@ LLUIImagePtr LLFolderBridge::getIconOverlay() const std::string LLFolderBridge::getLabelSuffix() const { - static LLCachedControl<F32> folder_loading_message_delay(gSavedSettings, "FolderLoadingMessageWaitTime"); + static LLCachedControl<F32> folder_loading_message_delay(gSavedSettings, "FolderLoadingMessageWaitTime", 0.5); return mIsLoading && mTimeSinceRequestStart.getElapsedTimeF32() >= folder_loading_message_delay() ? llformat(" ( %s ) ", LLTrans::getString("LoadingData").c_str()) : LLStringUtil::null; |