livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use LLUICachedControl in LLUI instead of LLCachedControl

meow-7.2.2
Ansariel 2021-01-28 23:08:57 +01:00
parent fd9c4e95b6
commit e5bd6bab57
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llui/llscrolllistctrl.cpp
View File

@ -2915,14 +2915,12 @@ void LLScrollListCtrl::sortByColumnIndex(U32 column, BOOL ascending)
updateSort();
}
// <FS:Beq/> FIRE-30667 et al. Group hang issues (grab settings)
extern LLControlGroup gSavedSettings;
void LLScrollListCtrl::updateSort() const
{
// <FS:Beq> FIRE-30667 et al. Group hang issues
// if (hasSortOrder() && !isSorted())
// {
static LLCachedControl<U32> sortDeferFrameCount( gSavedSettings, "FSSortDeferalFrames" );
static LLUICachedControl<U32> sortDeferFrameCount("FSSortDeferalFrames");
if ( hasSortOrder() && !isSorted() && ( mLastUpdateFrame > 1 && ( LLFrameTimer::getFrameCount() - mLastUpdateFrame ) >= sortDeferFrameCount ) )
// encoding two (unlikely) special values into mLastUpdateFrame 1 means we've sorted and 0 means we've nothing new to do.
// 0 is set after sorting, 1 can be set by a parent for any post sorting action.