diff options
| author | Mark Palange <palange@lindenlab.com> | 2008-10-07 22:43:15 +0000 |
|---|---|---|
| committer | Mark Palange <palange@lindenlab.com> | 2008-10-07 22:43:15 +0000 |
| commit | c9be97fdfcc6a4c6b23a8c90916af54a38d60ab0 (patch) | |
| tree | b0a7c83b643aff7a50208c3acd5caa4a9df1bbe2 /indra/newview/llviewermessage.cpp | |
| parent | 9d7c56bf16f6c093c7b8d486f943e8d6df4d6a24 (diff) | |
merge r97380-98701 branches/viewer/viewer_1-21 (Viewer RC5 and security fixes) merge to trunk
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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<LLUUID>& 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); } |