summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2013-12-05 15:26:38 -0500
committerMonty Brandenberg <monty@lindenlab.com>2013-12-05 15:26:38 -0500
commitda135de77dea24427f5e658ebac43b77c215cc9b (patch)
treeb6ccf4971d081a6dfc78a2729d015a7f01e912b2 /indra/newview/llviewermessage.cpp
parentb2d769534c82de2ac7b36f11ce6fab61f3e0d378 (diff)
parentfc4f6e2dacfc8944b1536004fed80c4ca3a24544 (diff)
Merge. Refresh from lli/monty_viewer-drano-http-3 in preparation for IQA fixes.
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 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: