summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
authordolphin <dolphin@lindenlab.com>2013-12-02 15:44:02 -0800
committerdolphin <dolphin@lindenlab.com>2013-12-02 15:44:02 -0800
commit27cf0ec7f34887ada651307fe438ef0d627bf67f (patch)
tree90611a41d9ad25b98db6899745208c8aab51c150 /indra/newview/llviewermessage.cpp
parentc6aa86750c22c20dca6895695386e2357b953bbd (diff)
parent787ccaf297e81291469aaf269f563d862fb150a3 (diff)
Merge with 3.6.11
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rwxr-xr-xindra/newview/llviewermessage.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 8a256e29f1..895400fc89 100755
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -3257,22 +3257,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: