summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml9
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_advanced.xml8
2 files changed, 8 insertions, 9 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 0f319ba6dc..a08bc16066 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -9,15 +9,6 @@
layout="topleft"
name="Me"
tear_off="true">
- <menu_item_check
- label="Display Name Demo"
- name="display_name_prototype">
- <menu_item_check.on_check
- function="IDEVO.CheckDisplayNames" />
- <menu_item_check.on_click
- function="IDEVO.ToggleDisplayNames" />
- </menu_item_check>
- <menu_item_separator />
<menu_item_call
label="Preferences"
layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index e604e401f6..8d49d3dfcd 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -271,4 +271,12 @@ Automatic position for:
<button.commit_callback
function="Pref.VoiceSetMiddleMouse" />
</button>
+ <check_box
+ follows="top|left"
+ height="15"
+ label="Use Display Names (PLACEHOLDER)"
+ left="30"
+ name="display_names_check"
+ width="237"
+ tool_tip="Check to use display names in chat, IM, name tags, etc."/>
</panel>