diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-11-21 15:26:51 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-11-21 15:26:51 -0800 |
| commit | 6d24bb6eab5e62af8909ea9659517a82ca21513b (patch) | |
| tree | 7630f299e9a707df4bad803c0e3e37d00c4658bc /indra/newview/llviewermessage.cpp | |
| parent | 22a3b0bd7baf132a90ddf02d5eb965b71451b757 (diff) | |
| parent | 787ccaf297e81291469aaf269f563d862fb150a3 (diff) | |
Pull merge from lindenlab/viewer-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: |
