From e5bd6bab57a4f9b4642ccf2f5b5ccab6bc1f803b Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Thu, 28 Jan 2021 23:08:57 +0100
Subject: [PATCH] Use LLUICachedControl in LLUI instead of LLCachedControl

---
 indra/llui/llscrolllistctrl.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index 8b6e01a9ca..b31b70f260 100644
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -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.