From b807e3df990e6fad25cd0bca94d2959dac042b13 Mon Sep 17 00:00:00 2001 From: Mark Palange Date: Wed, 8 Oct 2008 00:22:32 +0000 Subject: merge r97380-98701 branches/viewer/viewer_1-21 (Viewer RC5 and security fixes) merge to trunk (for real) --- indra/newview/llviewermessage.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview/llviewermessage.cpp') diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 72bc991a24..2278527bc9 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -862,7 +862,8 @@ void open_offer(const std::vector& items, const std::string& from_name) if(gSavedSettings.getBOOL("ShowInInventory") && asset_type != LLAssetType::AT_CALLINGCARD && - item->getInventoryType() != LLInventoryType::IT_ATTACHMENT) + item->getInventoryType() != LLInventoryType::IT_ATTACHMENT && + !from_name.empty()) { LLInventoryView::showAgentInventory(TRUE); } -- cgit v1.3