From 80333337630aeeb8a1841f1b9b693a78aa293225 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 24 Nov 2008 12:25:18 -0700
Subject: VWR-4826 (ability to ignore friendship offers).

---
 ChangeLog.txt                                           | 4 ++++
 linden/indra/newview/skins/default/xui/en-us/notify.xml | 9 +++++++++
 2 files changed, 13 insertions(+)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 2e0689d..e8417fc 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,6 +1,10 @@
 
 2008-11-23  McCabe Maxsted  <hakushakukun@gmail.com>
 
+	* linden/indra/newview/skins/default/xui/en-us/notify.xml:
+	VWR-4826 (ability to ignore friendship offers).
+
+
 	* linden/indra/newview/app_settings/settings.xml:
 	Beacons no longer persist between sessions.
 	That distressed users who accidentally enabled them,
diff --git a/linden/indra/newview/skins/default/xui/en-us/notify.xml b/linden/indra/newview/skins/default/xui/en-us/notify.xml
index 6af19ee..d207a74 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notify.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notify.xml
@@ -579,6 +579,9 @@ to his or her location:
 		<option name="Decline">
 			Decline
 		</option>
+		<option name="Ignore">
+			Ignore
+		</option>
 	</notify>
 	<notify name="OfferFriendshipNoMessage" tip="false">
 		<message name="message">
@@ -593,6 +596,9 @@ see each other&apos;s online status.)
 		<option name="Decline">
 			Decline
 		</option>
+		<option name="Ignore">
+			Ignore
+		</option>
 	</notify>
 	<notify name="FriendshipAccepted" tip="false">
 		<message name="message">
@@ -616,6 +622,9 @@ so you can quickly IM this resident.
 		<option name="Decline">
 			Decline
 		</option>
+		<option name="Ignore">
+			Ignore
+		</option>
 	</notify>
 	<notify name="RegionRestartMinutes" tip="false">
 		<message name="message">
-- 
cgit v1.1