merge changes for 3.6.11-release

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: