summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/floater_display_name.xml
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2022-08-31 00:17:37 +0300
committerAndrey Lihatskiy <alihatskiy@productengine.com>2022-08-31 00:17:37 +0300
commita9a63db0f08bcf5c2593bc8b6c7ab6e532376988 (patch)
tree6a246a607b5b4c3fb15f1d0826a468c6b57c5d4b /indra/newview/skins/default/xui/en/floater_display_name.xml
parente3ef38876b9951af3ea8052fb02db46212c76965 (diff)
parentd31a83fb946c49a38376ea3b312b5380d0c8c065 (diff)
Merge branch 'master' into DRTVWR-548-maint-N
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_display_name.xml')
-rw-r--r--indra/newview/skins/default/xui/en/floater_display_name.xml13
1 files changed, 2 insertions, 11 deletions
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 9a9fd32a77..3c8f415860 100644
--- a/indra/newview/skins/default/xui/en/floater_display_name.xml
+++ b/indra/newview/skins/default/xui/en/floater_display_name.xml
@@ -23,7 +23,7 @@
use_ellipses="true"
width="380"
wrap="true">
- The name you give your avatar is called your Display Name. You can change it once a week.
+ Your display name is what other people see above your head. It is different from your login name. You can change it once a week.
</text>
<text
type="string"
@@ -85,19 +85,10 @@
width="120" />
<button
height="23"
- label="Reset"
- layout="topleft"
- font="SansSerif"
- left_pad="5"
- name="reset_btn"
- tool_tip="Make Display Name the same as Username"
- width="120" />
- <button
- height="23"
label="Cancel"
font="SansSerif"
layout="topleft"
- left_pad="5"
+ left_pad="125"
name="cancel_btn"
width="120" />
</floater>