aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview
diff options
context:
space:
mode:
authorMcCabe Maxsted2008-11-24 12:25:18 -0700
committerJacek Antonelli2008-12-13 22:29:52 -0600
commit80333337630aeeb8a1841f1b9b693a78aa293225 (patch)
tree04482a92632e5793e623550b5ecc17c2c4ca2348 /linden/indra/newview
parentBeacons no longer persist between sessions. (diff)
downloadmeta-impy-80333337630aeeb8a1841f1b9b693a78aa293225.zip
meta-impy-80333337630aeeb8a1841f1b9b693a78aa293225.tar.gz
meta-impy-80333337630aeeb8a1841f1b9b693a78aa293225.tar.bz2
meta-impy-80333337630aeeb8a1841f1b9b693a78aa293225.tar.xz
VWR-4826 (ability to ignore friendship offers).
Diffstat (limited to 'linden/indra/newview')
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/notify.xml9
1 files changed, 9 insertions, 0 deletions
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:
579 <option name="Decline"> 579 <option name="Decline">
580 Decline 580 Decline
581 </option> 581 </option>
582 <option name="Ignore">
583 Ignore
584 </option>
582 </notify> 585 </notify>
583 <notify name="OfferFriendshipNoMessage" tip="false"> 586 <notify name="OfferFriendshipNoMessage" tip="false">
584 <message name="message"> 587 <message name="message">
@@ -593,6 +596,9 @@ see each other&apos;s online status.)
593 <option name="Decline"> 596 <option name="Decline">
594 Decline 597 Decline
595 </option> 598 </option>
599 <option name="Ignore">
600 Ignore
601 </option>
596 </notify> 602 </notify>
597 <notify name="FriendshipAccepted" tip="false"> 603 <notify name="FriendshipAccepted" tip="false">
598 <message name="message"> 604 <message name="message">
@@ -616,6 +622,9 @@ so you can quickly IM this resident.
616 <option name="Decline"> 622 <option name="Decline">
617 Decline 623 Decline
618 </option> 624 </option>
625 <option name="Ignore">
626 Ignore
627 </option>
619 </notify> 628 </notify>
620 <notify name="RegionRestartMinutes" tip="false"> 629 <notify name="RegionRestartMinutes" tip="false">
621 <message name="message"> 630 <message name="message">