diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-02 09:50:09 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-02 09:50:09 +0000 |
| commit | ac7539bd68b771a934cfdff79af2dfba336fca8d (patch) | |
| tree | 851c14292a141764d93398d7ff37ddfea19dfaae /indra | |
| parent | bc5be41bc0266a5d74f7ac6cab608e3cc7d95913 (diff) | |
CID-437
Checker: REVERSE_INULL
Function: RecoveredItemLinkCB::fire(const LLUUID &)
File: /indra/newview/llappearancemgr.cpp
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llappearancemgr.cpp | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 71df064236..03782510f2 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -528,22 +528,29 @@ public: LLViewerInventoryItem *item = gInventory.getItem(item_id); LLViewerInventoryItem *linked_item = item ? item->getLinkedItem() : NULL; - gInventory.addChangedMask(LLInventoryObserver::LABEL, linked_item->getUUID()); - - if (item && linked_item) + if (linked_item) { - LLFoundData found(linked_item->getUUID(), - linked_item->getAssetUUID(), - linked_item->getName(), - linked_item->getType(), - linked_item->isWearableType() ? linked_item->getWearableType() : WT_INVALID - ); - found.mWearable = mWearable; - mHolder->mFoundList.push_front(found); + gInventory.addChangedMask(LLInventoryObserver::LABEL, linked_item->getUUID()); + + if (item) + { + LLFoundData found(linked_item->getUUID(), + linked_item->getAssetUUID(), + linked_item->getName(), + linked_item->getType(), + linked_item->isWearableType() ? linked_item->getWearableType() : WT_INVALID + ); + found.mWearable = mWearable; + mHolder->mFoundList.push_front(found); + } + else + { + llwarns << "inventory item not found for recovered wearable" << llendl; + } } else { - llwarns << "inventory item or link not found for recovered wearable" << llendl; + llwarns << "inventory link not found for recovered wearable" << llendl; } } private: |