From be58f87ebb20bc2ef0057cb787b52fb279a702c3 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Tue, 30 Mar 2010 11:53:40 -0700
Subject: Remove some notifications eliminated in merge

---
 indra/newview/llnotificationhandlerutil.cpp          | 8 ++++----
 indra/newview/skins/default/xui/en/notifications.xml | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/indra/newview/llnotificationhandlerutil.cpp b/indra/newview/llnotificationhandlerutil.cpp
index ef9bc2afc5..b5e0d998fe 100644
--- a/indra/newview/llnotificationhandlerutil.cpp
+++ b/indra/newview/llnotificationhandlerutil.cpp
@@ -116,8 +116,8 @@ const static std::string GRANTED_MODIFY_RIGHTS("GrantedModifyRights"),
 		REVOKED_MODIFY_RIGHTS("RevokedModifyRights"), OBJECT_GIVE_ITEM(
 				"ObjectGiveItem"),
 						PAYMENT_RECEIVED("PaymentReceived"),
-						PAYMENT_RECEIVED_FOR("PaymentReceivedFor"),
-						PAYMENT_SENT("PaymentSent"),
+//						PAYMENT_RECEIVED_FOR("PaymentReceivedFor"),
+//						PAYMENT_SENT("PaymentSent"),
 						ADD_FRIEND_WITH_MESSAGE("AddFriendWithMessage"),
 						USER_GIVE_ITEM("UserGiveItem"),
 						INVENTORY_ACCEPTED("InventoryAccepted"),
@@ -139,8 +139,8 @@ bool LLHandlerUtil::canLogToIM(const LLNotificationPtr& notification)
 	return GRANTED_MODIFY_RIGHTS == notification->getName()
 			|| REVOKED_MODIFY_RIGHTS == notification->getName()
 			|| PAYMENT_RECEIVED == notification->getName()
-			|| PAYMENT_RECEIVED_FOR == notification->getName()
-			|| PAYMENT_SENT == notification->getName()
+//			|| PAYMENT_RECEIVED_FOR == notification->getName()
+//			|| PAYMENT_SENT == notification->getName()
 			|| OFFER_FRIENDSHIP == notification->getName()
 			|| FRIENDSHIP_OFFERED == notification->getName()
 			|| FRIENDSHIP_ACCEPTED == notification->getName()
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index c1f1afe93d..0e14b06407 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4667,9 +4667,10 @@ Please select at least one type of content to search (General, Moderate, or Adul
    icon="notify.tga"
    name="PaymentReceived"
    type="notify">
-[NAME] paid you L$[AMOUNT].
+[MESSAGE]
   </notification>
 
+  <!--
   <notification
    icon="notify.tga"
    name="PaymentReceivedFor"
@@ -4683,6 +4684,7 @@ Please select at least one type of content to search (General, Moderate, or Adul
    type="notify">
 You paid [NAME] L$[AMOUNT][REASON].
   </notification>
+  -->
 
   <notification
    icon="notify.tga"
-- 
cgit v1.2.3