diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2011-06-29 11:36:19 -0700 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2011-06-29 11:36:19 -0700 |
| commit | cc73cf15e6c2a361df278cb0b66c4d68c6acfbcd (patch) | |
| tree | 27140b901d74acd106c5fc4c7a96a2e578635347 /indra/newview/skins/default/xui/en/notifications.xml | |
| parent | 1fbf3e0ec297004879d766cad11c5e9e15b86d4b (diff) | |
| parent | a300902494f76b9542c3978c2ca80726cefbc942 (diff) | |
Merge latest from lindenlab/viewer-development
Diffstat (limited to 'indra/newview/skins/default/xui/en/notifications.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index ce96c488b4..db1cee5d08 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -3698,6 +3698,19 @@ Join me in [REGION] <notification icon="alertmodal.tga" + name="TooManyTeleportOffers" + type="alertmodal"> +You attempted to make [OFFERS] teleport offers +which exceeds the limit of [LIMIT]. + <tag>group</tag> + <tag>fail</tag> + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" name="OfferTeleportFromGod" type="alertmodal"> God summon Resident to your location? @@ -6823,7 +6836,9 @@ Select residents to share with. name="MeshUploadError" icon="alert.tga" type="alert"> - [LABEL] failed to upload: [MESSAGE] [IDENTIFIER] [INVALIDITY_IDENTIFIER] + [LABEL] failed to upload: [MESSAGE] [IDENTIFIER] + +See the log file for details. </notification> <notification |