summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2010-03-18 17:19:57 -0700
committerJames Cook <james@lindenlab.com>2010-03-18 17:19:57 -0700
commit639b234762133e4d09d6d7b1bac9d25c5a681926 (patch)
treed99a727f3fa9c53faecd434b2735da1094b9a519 /indra/newview/skins/default
parent10fc6ee4a012fa7232868261d6e11a76652c3cca (diff)
Partial support for Set Name returning error msg from service
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml21
-rw-r--r--indra/newview/skins/default/xui/en/panel_edit_profile.xml1
2 files changed, 21 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 8c07198111..e7d64fd82f 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3055,6 +3055,27 @@ Change your display name?
<notification
icon="alertmodal.tga"
+ name="SetDisplayNameFailedGeneric"
+ type="alertmodal">
+ Sorry, we could not set your display name. Please try again later.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="SetDisplayNameFailedThrottle"
+ type="alertmodal">
+ Sorry, you can only change your display name once every [FREQUENCY] hour(s).
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="SetDisplayNameFailedUnavailable"
+ type="alertmodal">
+ Sorry, we could not set that display name. Please try a different name.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
name="OfferTeleport"
type="alertmodal">
Offer a teleport to your location with the following message?
diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
index 1b624da68a..bce988da9d 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -115,7 +115,6 @@
left="170"
name="set_name"
top_delta="-4"
- visible="false"
width="110" />
<panel
name="lifes_images_panel"