diff options
| author | angela <angela@lindenlab.com> | 2010-02-11 23:34:20 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2010-02-11 23:34:20 +0800 |
| commit | f078c53da8ee11b7bb383c0974875b5ff4a15c6a (patch) | |
| tree | f8fd975ace547f1e3c194cfa3446f1ef35b2d12b /indra/newview/llfavoritesbar.cpp | |
| parent | 3684b437a0e1c4c8be6d05e3a5f131265b8f1a39 (diff) | |
| parent | 5e12a2cb697ad1d82a472cc35fc3570209e5ec0e (diff) | |
merge with remote repo
Diffstat (limited to 'indra/newview/llfavoritesbar.cpp')
| -rw-r--r-- | indra/newview/llfavoritesbar.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp index 1e8a739d78..bf7c735488 100644 --- a/indra/newview/llfavoritesbar.cpp +++ b/indra/newview/llfavoritesbar.cpp @@ -1264,8 +1264,11 @@ LLInventoryModel::item_array_t::iterator LLFavoritesBarCtrl::findItemByUUID(LLIn void LLFavoritesBarCtrl::insertBeforeItem(LLInventoryModel::item_array_t& items, const LLUUID& beforeItemId, LLViewerInventoryItem* insertedItem) { LLViewerInventoryItem* beforeItem = gInventory.getItem(beforeItemId); - - items.insert(findItemByUUID(items, beforeItem->getUUID()), insertedItem); + llassert(beforeItem); + if (beforeItem) + { + items.insert(findItemByUUID(items, beforeItem->getUUID()), insertedItem); + } } // EOF |