diff options
author | Oz Linden <oz@lindenlab.com> | 2013-11-26 16:09:43 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-11-26 16:09:43 -0500 |
commit | fe3a9306233d8fddbbb7d961c398e51d49c29b42 (patch) | |
tree | 1875aa113b8b356b26eada5bb64cbf5b0d15824d /indra/newview/llviewermessage.cpp | |
parent | 335810246253c04ac3c2ab4f5db556991ed717d6 (diff) | |
parent | 52ec6f9af029797615a80e5a889572c18914d56e (diff) |
merge fix for STORM-1984
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rwxr-xr-x | indra/newview/llviewermessage.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 82131c6675..3574d37adf 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -3256,22 +3256,22 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) if (add_notification) { - if(message.empty()) - { - //support for frienship offers from clients before July 2008 - LLNotificationsUtil::add("OfferFriendshipNoMessage", args, payload); - } - else - { - args["[MESSAGE]"] = message; - LLNotification::Params params("OfferFriendship"); - params.substitutions = args; - params.payload = payload; - LLPostponedNotification::add<LLPostponedOfferNotification>( params, from_id, false); - } + if(message.empty()) + { + //support for frienship offers from clients before July 2008 + LLNotificationsUtil::add("OfferFriendshipNoMessage", args, payload); + } + else + { + args["[MESSAGE]"] = message; + LLNotification::Params params("OfferFriendship"); + params.substitutions = args; + params.payload = payload; + LLPostponedNotification::add<LLPostponedOfferNotification>( params, from_id, false); } } } + } break; case IM_FRIENDSHIP_ACCEPTED: |