diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-02-11 14:53:11 +0000 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-02-11 14:53:11 +0000 |
| commit | d7e8a30a5a9bd416254f83e20054c73edf3f890d (patch) | |
| tree | 43a156ca397913ce7da626ac9c002e1036f2460c /indra/newview/llviewermessage.cpp | |
| parent | 898e9da1af113704e2e10328dfa5396deb24eb30 (diff) | |
| parent | 1b8a7fdeaab78216baad1f916e9788c0b90287b3 (diff) | |
merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index d9b5344dd4..8aa642bdb6 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -867,6 +867,10 @@ void open_inventory_offer(const std::vector<LLUUID>& items, const std::string& f } LLInventoryItem* item = gInventory.getItem(item_id); + llassert(item); + if (!item) { + continue; + } //////////////////////////////////////////////////////////////////////////////// // Special handling for various types. @@ -1302,13 +1306,6 @@ bool LLOfferInfo::inventory_task_offer_callback(const LLSD& notification, const msg->addUUIDFast(_PREHASH_RegionID, LLUUID::null); msg->addVector3Fast(_PREHASH_Position, gAgent.getPositionAgent()); LLInventoryObserver* opener = NULL; - LLViewerInventoryCategory* catp = NULL; - catp = (LLViewerInventoryCategory*)gInventory.getCategory(mObjectID); - LLViewerInventoryItem* itemp = NULL; - if(!catp) - { - itemp = (LLViewerInventoryItem*)gInventory.getItem(mObjectID); - } std::string from_string; // Used in the pop-up. std::string chatHistory_string; // Used in chat history. |