Merge

--HG--
branch : product-engine

indra/newview/llnotificationhandlerutil.cpp

@@ -54,6 +54,8 @@ const static std::string GRANTED_MODIFY_RIGHTS("GrantedModifyRights"),
 						OFFER_FRIENDSHIP("OfferFriendship"),
 						FRIENDSHIP_ACCEPTED("FriendshipAccepted"),
 						FRIENDSHIP_OFFERED("FriendshipOffered"),
+						FRIENDSHIP_ACCEPTED_BYME("FriendshipAcceptedByMe"),
+						FRIENDSHIP_DECLINED_BYME("FriendshipDeclinedByMe"),
 						FRIEND_ONLINE("FriendOnline"), FRIEND_OFFLINE("FriendOffline"),
 						SERVER_OBJECT_MESSAGE("ServerObjectMessage"),
 						TELEPORT_OFFERED("TeleportOffered");
@@ -66,6 +68,8 @@ bool LLHandlerUtil::canLogToIM(const LLNotificationPtr& notification)
 			|| PAYMENT_RECIVED == notification->getName()
 			|| OFFER_FRIENDSHIP == notification->getName()
 			|| FRIENDSHIP_OFFERED == notification->getName()
+			|| FRIENDSHIP_ACCEPTED_BYME == notification->getName()
+			|| FRIENDSHIP_DECLINED_BYME == notification->getName()
 			|| SERVER_OBJECT_MESSAGE == notification->getName()
 			|| INVENTORY_ACCEPTED == notification->getName()
 			|| INVENTORY_DECLINED == notification->getName();

indra/newview/llviewermessage.cpp

@@ -193,9 +193,16 @@ bool friendship_offer_callback(const LLSD& notification, const LLSD& response)
 		msg->nextBlockFast(_PREHASH_FolderData);
 		msg->addUUIDFast(_PREHASH_FolderID, fid);
 		msg->sendReliable(LLHost(payload["sender"].asString()));
+
+		LLNotificationsUtil::add("FriendshipAcceptedByMe",
+				notification["substitutions"], notification["payload"]);
 		break;
 	}
 	case 1: // Decline
+	{
+		LLNotificationsUtil::add("FriendshipDeclinedByMe",
+				notification["substitutions"], notification["payload"]);
+	}
 	case 2: // Send IM - decline and start IM session
 		{
 			// decline

indra/newview/skins/default/xui/en/notifications.xml

@@ -5204,8 +5204,22 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you th
    name="FriendshipDeclined"
    type="notify">
 [NAME] declined your friendship offer.
+  </notification>
+  
+    <notification
+   icon="notify.tga"
+   name="FriendshipAcceptedByMe"
+   type="offer">
+Friend request accepted.
   </notification>
 
+  <notification
+   icon="notify.tga"
+   name="FriendshipDeclinedByMe"
+   type="notify">
+Friend request declined.
+  </notification>
+  
   <notification
    icon="notify.tga"
    name="OfferCallingCard"