diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-28 12:31:43 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-28 12:31:43 +0100 |
| commit | 3927d183278e4cc11396a2c78b9393bcf6b0e802 (patch) | |
| tree | 4a93cabe0991aac07c4a10941db967fe6c5d8e4e /indra/newview | |
| parent | 878e1d06d5e9ac3bb6c002d3fd7342f5beda2017 (diff) | |
CID-466
Checker: NULL_RETURNS
Function: LLInventoryItemsList::refresh()
File: /indra/newview/llinventoryitemslist.cpp
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llinventoryitemslist.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/newview/llinventoryitemslist.cpp b/indra/newview/llinventoryitemslist.cpp index 1c3eb547bb..750cdfb678 100644 --- a/indra/newview/llinventoryitemslist.cpp +++ b/indra/newview/llinventoryitemslist.cpp @@ -388,7 +388,7 @@ void LLInventoryItemsList::refresh() computeDifference(getIDs(), added_items, removed_items); bool add_limit_exceeded = false; - unsigned nadded = 0; + unsigned int nadded = 0; uuid_vec_t::const_iterator it = added_items.begin(); for( ; added_items.end() != it; ++it) @@ -400,8 +400,12 @@ void LLInventoryItemsList::refresh() } LLViewerInventoryItem* item = gInventory.getItem(*it); // Do not rearrange items on each adding, let's do that on filter call - addNewItem(item, false); - ++nadded; + llassert(item); + if (item) + { + addNewItem(item, false); + ++nadded; + } } it = removed_items.begin(); |