livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CID-437 

Checker: REVERSE_INULL
Function: RecoveredItemLinkCB::fire(const LLUUID &)
File: /indra/newview/llappearancemgr.cpp
meow-7.2.2
Tofu Linden 2010-03-02 09:50:09 +00:00
parent bc5be41bc0
commit ac7539bd68
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
indra/newview/llappearancemgr.cpp
View File

@ -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: