1 files changed, 13 insertions, 6 deletions

diff --git a/linden/indra/newview/llfolderview.cpp b/linden/indra/newview/llfolderview.cpp
index 16c0aa9..ce2b2b4 100644
--- a/linden/indra/newview/llfolderview.cpp
+++ b/linden/indra/newview/llfolderview.cpp
@@ -2893,7 +2893,9 @@ const std::string LLFolderView::getFilterSubString(BOOL trim)
 void LLFolderView::filter( LLInventoryFilter& filter )
 {
         LLFastTimer t2(LLFastTimer::FTM_FILTER);
-        filter.setFilterCount(llclamp(gSavedSettings.getS32("FilterItemsPerFrame"), 1, 5000));
+        static S32 *sFilterItemsPerFrame = rebind_llcontrol<S32>("FilterItemsPerFrame", &gSavedSettings, true);
+
+        filter.setFilterCount(llclamp(*sFilterItemsPerFrame, 1, 5000));
 
         if (getCompletedFilterGeneration() < filter.getCurrentGeneration())
         {
@@ -3264,8 +3266,10 @@ void LLFolderView::draw()
                 setShowSingleSelection(FALSE);
         }
 
+        static F32 *sTypeAheadTimeout = rebind_llcontrol<F32>("TypeAheadTimeout", &gSavedSettings, true);
+
 
-        if (mSearchTimer.getElapsedTimeF32() > gSavedSettings.getF32("TypeAheadTimeout") || !mSearchString.size())
+        if (mSearchTimer.getElapsedTimeF32() > *sTypeAheadTimeout || !mSearchString.size())
         {
                 mSearchString.clear();
         }
@@ -3995,8 +3999,11 @@ BOOL LLFolderView::handleUnicodeCharHere(llwchar uni_char)
                         LLMenuGL::sMenuContainer->hideMenus();
                 }
 
+                static F32 *sTypeAheadTimeout = rebind_llcontrol<F32>("TypeAheadTimeout", &gSavedSettings, true);
+
+
                 //do text search
-                if (mSearchTimer.getElapsedTimeF32() > gSavedSettings.getF32("TypeAheadTimeout"))
+                if (mSearchTimer.getElapsedTimeF32() > *sTypeAheadTimeout)
                 {
                         mSearchString.clear();
                 }
@@ -4340,10 +4347,10 @@ void LLFolderView::doIdle()
 {
         LLFastTimer t2(LLFastTimer::FTM_INVENTORY);
 
-        BOOL debug_filters = gSavedSettings.getBOOL("DebugInventoryFilters");
-        if (debug_filters != getDebugFilters())
+        static BOOL* debug_filters = rebind_llcontrol<BOOL>("DebugInventoryFilters", &gSavedSettings, true);
+        if (*debug_filters != getDebugFilters())
         {
-                mDebugFilters = debug_filters;
+                mDebugFilters = *debug_filters;
                 arrangeAll();
         }