Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge shyotl, setting include broken (disabled)

Browse Source
This commit is contained in:
Siana Gearz
2010-11-09 15:14:34 +01:00
parent 8d6ce154fd f357842265
commit 17a0d13b0c
61 changed files with 3320 additions and 2231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llfolderview.cpp
View File

@@ -2939,7 +2939,7 @@ const std::string LLFolderView::getFilterSubString(BOOL trim)
void LLFolderView::filter( LLInventoryFilter& filter )
{
LLFastTimer t2(LLFastTimer::FTM_FILTER);
static LLCachedControl<S32> filter_items_per_frame("FilterItemsPerFrame",500);
static const LLCachedControl<S32> filter_items_per_frame("FilterItemsPerFrame",500);
filter.setFilterCount(llclamp((S32)filter_items_per_frame, 1, 5000));
if (getCompletedFilterGeneration() < filter.getCurrentGeneration())
@@ -4395,7 +4395,7 @@ void LLFolderView::doIdle()
{
LLFastTimer t2(LLFastTimer::FTM_INVENTORY);
static LLCachedControl<bool> debug_filters("DebugInventoryFilters",false);
static const LLCachedControl<bool> debug_filters("DebugInventoryFilters",false);
if (debug_filters != (bool)getDebugFilters())
{
mDebugFilters = debug_filters;