summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-07-19 09:10:41 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-07-19 09:10:41 +0100
commit3bb5d368a21e2645222f0f5fa57b0a0abb236084 (patch)
tree9252aa83846139a3932dadb2260a4acdfeff0086 /indra/newview/skins/default
parent94cae52bb791b8ceef4d55eed8c8726e63572b61 (diff)
parent0fa0ffb5748bd9b8d61954649eafe3e28517548c (diff)
merge from PE's viewer-release
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 04bdb4302c..cd6939ede6 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6402,11 +6402,14 @@ If you continue to have problems, please visit the [SUPPORT_SITE].
- Your system memory does not meet the minimum requirements.
</global>
-<!-- this is alert string from server. the name needs to match entire the server string, and needs to be changed
+<!-- these are alert strings from server. the name needs to match entire the server string, and needs to be changed
whenever the server string changes -->
<global name="You can only set your 'Home Location' on your land or at a mainland Infohub.">
If you own a piece of land, you can make it your home location.
Otherwise, you can look at the Map and find places marked &quot;Infohub&quot;.
</global>
+ <global name="You died and have been teleported to your home location">
+You died and have been teleported to your home location.
+ </global>
</notifications>