diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-22 10:51:58 -0800 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-22 10:51:58 -0800 |
commit | 3889d4329962cc497bccbc8bbe9e6678ab3c9e6c (patch) | |
tree | da02c07350e9c4def5013376dbbc382a3e49d57e /indra/newview/llviewermessage.cpp | |
parent | fa891c062ef66410123c66de1ef67b7dcef327db (diff) | |
parent | 09e9cdeb2e7e979ea1d4898fa7c2d40e8ebc52b2 (diff) |
PE merge.
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rw-r--r-- | indra/newview/llviewermessage.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 7487fa9997..0358efc0af 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -1472,7 +1472,12 @@ void inventory_offer_handler(LLOfferInfo* info) { LLStringUtil::truncate(msg, indx); } - + + if(LLAssetType::AT_LANDMARK == info->mType) + { + msg = LLViewerInventoryItem::getDisplayName(msg); + } + LLSD args; args["[OBJECTNAME]"] = msg; |