From 84f06e40e1e12723228e31d1a329c899cec99751 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Wed, 13 Oct 2010 14:36:01 -0700
Subject: DN-165 User cannot reset name to default if they are throttled
 because they receive the Sorry you cannot change your display name until
 [time] message. They cannot access the change display name dialog to hit
 reset when throttled.

---
 .../skins/default/xui/en/floater_display_name.xml  | 34 +++++++++++++++++-----
 .../newview/skins/default/xui/en/notifications.xml | 10 +------
 2 files changed, 28 insertions(+), 16 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_display_name.xml b/indra/newview/skins/default/xui/en/floater_display_name.xml
index ecf2e524aa..7a3fb9334a 100644
--- a/indra/newview/skins/default/xui/en/floater_display_name.xml
+++ b/indra/newview/skins/default/xui/en/floater_display_name.xml
@@ -3,12 +3,13 @@
  legacy_header_height="18"
  can_minimize="false"
  can_close="false" 
- height="280"
+ height="300"
  layout="topleft"
  name="Display Name"
  help_topic="display_name"
  save_rect="false"
- width="440">
+ title="CHANGE DISPLAY NAME" 
+ width="445">
     <text
      type="string"
      length="1"
@@ -20,17 +21,34 @@
      name="info_text"
      top="40"
      use_ellipses="true"
-     width="400"
+     width="380"
      wrap="true">
       The name you give your avatar is called your Display Name. You can change it once a week.
     </text>
+	<text
+     type="string"
+     length="1"
+     follows="left|top"
+     font="SansSerif"
+     height="25"
+     layout="topleft"
+     left="25"
+	 text_color="EmphasisColor" 
+     name="lockout_text"
+     top="80"
+     use_ellipses="true"
+	 visible="false" 
+     width="410"
+     wrap="true">
+		You cannot change your Display Name until: [TIME].
+	</text>
     <text
-      top_pad="15"
+      top_pad="10"
       width="150"
       height="20"
       font="SansSerif"
       name="set_name_label">
-      New display name:
+      New Display Name:
     </text>
     <line_editor
       width="330"
@@ -39,9 +57,9 @@
       height="20"
       top_pad="5"
       left="50" />
-    <text
+	<text
        top_pad="15"
-       left="25" 
+       left="25"
        width="300"
        height="20"
       font="SansSerif"
@@ -62,6 +80,7 @@
      font="SansSerif"
      left="35"
      name="save_btn"
+     tool_tip="Save your new Display Name" 
      top_pad="40"
      width="120" />
     <button
@@ -71,6 +90,7 @@
      font="SansSerif"
      left_pad="5"
      name="reset_btn"
+     tool_tip="Make Display Name the same as Username"
      width="120" />
     <button
      height="23"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 4e25efe555..7e9cc6772d 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3193,14 +3193,6 @@ Hi [DISPLAY_NAME]!
 Just like in real life, it takes a while for everyone to learn about a new name.  Please allow several days for [http://wiki.secondlife.com/wiki/Setting_your_display_name your name to update] in objects, scripts, search, etc.
   </notification>
 
-  <notification
-   icon="alertmodal.tga"
-   name="SetDisplayNameFailedLockout"
-   type="alert">
-Sorry, you cannot [http://wiki.secondlife.com/wiki/Setting_your_display_name change your display name] until:
-[TIME]
-  </notification>
-
   <notification
  icon="alertmodal.tga"
  name="SetDisplayNameBlocked"
@@ -3231,7 +3223,7 @@ Please try a shorter name.
     The display names you entered do not match. Please re-enter.
   </notification>
 
-  <!-- *NOTE: This should never happen, users should see SetDisplayNameFailedLockout above -->
+  <!-- *NOTE: This should never happen -->
   <notification
    icon="alertmodal.tga"
    name="AgentDisplayNameUpdateThresholdExceeded"
-- 
cgit v1.2.3