From ac7539bd68b771a934cfdff79af2dfba336fca8d Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Tue, 2 Mar 2010 09:50:09 +0000
Subject: [PATCH] CID-437
Checker: REVERSE_INULL
Function: RecoveredItemLinkCB::fire(const LLUUID &)
File: /indra/newview/llappearancemgr.cpp
---
indra/newview/llappearancemgr.cpp | 31 +++++++++++++++++++------------
1 file changed, 19 insertions(+), 12 deletions(-)
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 71df0642367..03782510f2f 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -528,22 +528,29 @@ class RecoveredItemLinkCB: public LLInventoryCallback
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:
--
GitLab