diff options
| author | Richard Linden <none@none> | 2012-08-01 01:27:38 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-08-01 01:27:38 -0700 |
| commit | 997812c7b04f9edc119006baeb261cf602631978 (patch) | |
| tree | ec470bc9af3cb207d9e9a504728bda679be673fe /indra/newview/skins | |
| parent | a204059d2e69fb33cb1a3c8d2fbed35d3967297c (diff) | |
| parent | 2855e8bf8e91454e814cdd00985056830d8a8f5b (diff) | |
merge with ssh://hg.lindenlab.com/richard/viewer-chui
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index f3d2762d3f..e85637826d 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -6413,6 +6413,7 @@ Your object named <nolink>[OBJECTFROMNAME]</nolink> has given you th icon="notify.tga" name="TeleportOffered" log_to_im="true" + log_to_chat="false" type="offer"> [NAME_SLURL] has offered to teleport you to their location: @@ -6434,6 +6435,8 @@ Your object named <nolink>[OBJECTFROMNAME]</nolink> has given you th <notification icon="notify.tga" name="TeleportOffered_MaturityExceeded" + log_to_im="true" + log_to_chat="false" type="offer"> [NAME_SLURL] has offered to teleport you to their location: @@ -6457,6 +6460,8 @@ This region contains [REGION_CONTENT_MATURITY] content, but your current prefere <notification icon="notify.tga" name="TeleportOffered_MaturityBlocked" + log_to_im="true" + log_to_chat="false" type="notifytip"> [NAME_SLURL] has offered to teleport you to their location: @@ -6471,6 +6476,7 @@ However, this region contains content accessible to adults only. icon="notify.tga" name="TeleportOfferSent" log_to_im="true" + log_to_chat="false" show_toast="false" type="offer"> Teleport offer sent to [TO_NAME] |