diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-02 09:53:52 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-02 09:53:52 +0000 |
| commit | 1394d21b7a525c4cbe6780dbd478d3bf2f946fa3 (patch) | |
| tree | c7dd757fd364e88c4cea252eb4c84b6ff81df54e /indra/newview/llappearancemgr.cpp | |
| parent | ac7539bd68b771a934cfdff79af2dfba336fca8d (diff) | |
CID-436
Checker: NULL_RETURNS
Function: RecoveredItemCB::fire(const LLUUID &)
File: /indra/newview/llappearancemgr.cpp
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
| -rw-r--r-- | indra/newview/llappearancemgr.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 03782510f2..5c21be8c32 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -575,12 +575,16 @@ public: mWearable->setItemID(item_id); LLPointer<LLInventoryCallback> cb = new RecoveredItemLinkCB(mType,mWearable,mHolder); mHolder->mTypesToRecover.erase(mType); - link_inventory_item( gAgent.getID(), - item_id, - LLAppearanceManager::instance().getCOF(), - itemp->getName(), - LLAssetType::AT_LINK, - cb); + llassert(itemp); + if (itemp) + { + link_inventory_item( gAgent.getID(), + item_id, + LLAppearanceManager::instance().getCOF(), + itemp->getName(), + LLAssetType::AT_LINK, + cb); + } } private: LLWearableHoldingPattern* mHolder; |