summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-05-11 14:45:31 -0400
committerOz Linden <oz@lindenlab.com>2012-05-11 14:45:31 -0400
commitfb44dbb164b08b61c7ac4ab6e0565c972ee0e66b (patch)
treebb81ec3b3ddd75e665b00dcbd201952749f9e1c0 /indra/newview/skins/default
parent6d9c0fab8f2c19fa624e3c1f697ee9c7f08d9245 (diff)
move preferences from Advanced menu to Chat tab of preferences floater
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml5
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_chat.xml2
2 files changed, 1 insertions, 6 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 26abc754db..5ba566b175 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1836,11 +1836,6 @@
<menu_item_separator/>
<menu_item_call
- label="Show Autoreplace Settings">
- <menu_item_call.on_click
- function="Advanced.ShowAutoreplaceSettings" />
- </menu_item_call>
- <menu_item_call
label="Show Debug Settings"
name="Debug Settings">
<menu_item_call.on_click
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 12bf6c5296..33a9a8e632 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -223,7 +223,7 @@
top_pad="-23"
left_pad="5"
name="ac_showgui"
- commit_callback.function="Pref.ShowAC"
+ commit_callback.function="Pref.AutoReplace
label="AutoReplace Settings"
width="150">
</button>