diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-02-11 09:49:57 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-02-11 09:49:57 +0200 |
| commit | b0af6b8acb33c86e5ac8d693131b5c9e7d9407b5 (patch) | |
| tree | dbe58da2c0ff07a8950548a513db31806f0308d4 /indra/newview/llviewermessage.cpp | |
| parent | d3bde04a8c3a2cd142bb75dbcad577d083aad0d1 (diff) | |
| parent | abae31cb4a26500012663cdc2a06a290ac4e46c9 (diff) | |
Merge from default branch
--HG--
branch : product-engine
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. |