summaryrefslogtreecommitdiff
path: root/indra/newview/llinventoryitemslist.cpp
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-08-02 18:59:35 +0300
committerVadim Savchuk <vsavchuk@productengine.com>2010-08-02 18:59:35 +0300
commit3b7da511179fd2e2e734a4f3137ac8813a5eebee (patch)
tree6642492a8be25cf36de2712d019e31f1681ac9ea /indra/newview/llinventoryitemslist.cpp
parent122209c4a61ce00bc6157c7ae0b9311930f4410b (diff)
parentd1094573117db0a951a7e6159a352b0f4c8a8a24 (diff)
Merge from default branch
--HG-- branch : product-engine
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