summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2013-01-15 10:42:09 -0800
committerGilbert Gonzales <gilbert@lindenlab.com>2013-01-15 10:42:09 -0800
commit028ceaef1441cbd2d87b294c6cfe7193a6b8bbd7 (patch)
tree7b35e8b814e41d1aef77a291249298a60c25a11e /indra/newview/skins
parent0e90e94a4d5cbac2d186f0056821a51078e8d1bd (diff)
parenta49d3b14254fa5cfac3900e86b2287a016eaf9cc (diff)
merging in latest changes
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml20
1 files changed, 18 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml
index 483f24afd0..f2a8b39b04 100644
--- a/indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml
+++ b/indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml
@@ -44,7 +44,23 @@
parameter="IMShowNamesForP2PConv" />
<menu_item_check.on_enable
function="IMSession.Menu.ShowModes.Enable"
- parameter="IMShowNamesForP2PConv" />
-
+ parameter="IMShowNamesForP2PConv" />
</menu_item_check>
+ <menu_item_separator layout="topleft" />
+ <menu_item_check name="Translate_chat" label="Translate chat">
+ <menu_item_check.on_click
+ function="Translating.Toggle" />
+ <menu_item_check.on_check
+ function="Translating.On" />
+ <menu_item_check.on_enable
+ function="Translating.Enabled" />
+ </menu_item_check>
+ <menu_item_check name="Translation_settings" label="Translation settings...">
+ <menu_item_check.on_check
+ function="Floater.Visible"
+ parameter="prefs_translation" />
+ <menu_item_check.on_click
+ function="Floater.Toggle"
+ parameter="prefs_translation" />
+ </menu_item_check>
</toggleable_menu>