diff options
| author | Richard Linden <none@none> | 2011-03-08 16:47:42 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-03-08 16:47:42 -0800 |
| commit | bc22d31caee8479a89366155062df45302021bba (patch) | |
| tree | 2989fdee4329b37d75e728030466d129efa09241 /indra/newview/llviewermessage.cpp | |
| parent | 0e5fd6a1483e12a46dc94f318f3e43ec328def54 (diff) | |
| parent | f3e37e047206b909c212a02493be6972fba2c8aa (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-social/
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 103989ee80..c2449907ac 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -1715,15 +1715,18 @@ bool LLOfferInfo::inventory_task_offer_callback(const LLSD& notification, const msg->addBinaryDataFast(_PREHASH_BinaryBucket, EMPTY_BINARY_BUCKET, EMPTY_BINARY_BUCKET_SIZE); // send the message msg->sendReliable(mHost); + + if (gSavedSettings.getBOOL("LogInventoryDecline")) { LLStringUtil::format_map_t log_message_args; log_message_args["DESC"] = mDesc; log_message_args["NAME"] = mFromName; log_message = LLTrans::getString("InvOfferDecline", log_message_args); + + LLSD args; + args["MESSAGE"] = log_message; + LLNotificationsUtil::add("SystemMessage", args); } - LLSD args; - args["MESSAGE"] = log_message; - LLNotificationsUtil::add("SystemMessage", args); if (busy && (!mFromGroup && !mFromObject)) { |