diff options
-rw-r--r-- | ChangeLog.txt | 4 | ||||
-rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/notify.xml | 9 |
2 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 2e0689d..e8417fc 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -1,6 +1,10 @@ | |||
1 | 1 | ||
2 | 2008-11-23 McCabe Maxsted <hakushakukun@gmail.com> | 2 | 2008-11-23 McCabe Maxsted <hakushakukun@gmail.com> |
3 | 3 | ||
4 | * linden/indra/newview/skins/default/xui/en-us/notify.xml: | ||
5 | VWR-4826 (ability to ignore friendship offers). | ||
6 | |||
7 | |||
4 | * linden/indra/newview/app_settings/settings.xml: | 8 | * linden/indra/newview/app_settings/settings.xml: |
5 | Beacons no longer persist between sessions. | 9 | Beacons no longer persist between sessions. |
6 | That distressed users who accidentally enabled them, | 10 | 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: | |||
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'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"> |