diff options
author | Oz Linden <oz@lindenlab.com> | 2014-01-07 11:39:06 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2014-01-07 11:39:06 -0500 |
commit | 69c32b04cfd52c6fbd34997fa6485a84435743ef (patch) | |
tree | 9e95073f5d7109b86ed5fdb06b26dae4416c7146 /indra/newview/llviewermessage.cpp | |
parent | dc2af90b04a16a41851874b9ab55b4ac61af2d7b (diff) | |
parent | 1a9b9f1bd1b5f64b35b9ce6eff458cdb7a79fe6e (diff) |
merge changes for 3.6.12-release
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: |