summaryrefslogtreecommitdiff
path: root/indra/newview/llinventoryitemslist.cpp
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-07-27 14:13:07 -0700
committerLeyla Farazha <leyla@lindenlab.com>2010-07-27 14:13:07 -0700
commit0e06dc8964d5ae31fccb2da522d05d822530d3c7 (patch)
treed15dfd4ab9dfc4724efe62373cbca6a24c97006b /indra/newview/llinventoryitemslist.cpp
parent4c9760a073853ae81a78aa99119c059cdfaba664 (diff)
parentfe8a5a007ab82f3d6a763c5cb133e1299d238632 (diff)
Merge from dessie/viewer-release
Diffstat (limited to 'indra/newview/llinventoryitemslist.cpp')
-rw-r--r--indra/newview/llinventoryitemslist.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/indra/newview/llinventoryitemslist.cpp b/indra/newview/llinventoryitemslist.cpp
index e01f05c0f2..fbb3774917 100644
--- a/indra/newview/llinventoryitemslist.cpp
+++ b/indra/newview/llinventoryitemslist.cpp
@@ -107,12 +107,9 @@ void LLInventoryItemsList::idle(void* user_data)
}
}
-LLFastTimer::DeclareTimer FTM_INVENTORY_ITEMS_REFRESH("Inventory List Refresh");
-
void LLInventoryItemsList::refresh()
{
- LLFastTimer _(FTM_INVENTORY_ITEMS_REFRESH);
- static const unsigned ADD_LIMIT = 20;
+ static const unsigned ADD_LIMIT = 50;
uuid_vec_t added_items;
uuid_vec_t removed_items;
@@ -143,8 +140,7 @@ void LLInventoryItemsList::refresh()
it = removed_items.begin();
for( ; removed_items.end() != it; ++it)
{
- // don't filter items right away
- removeItemByUUID(*it, false);
+ removeItemByUUID(*it);
}
// Filter, rearrange and notify parent about shape changes