From 702b44426e036495c5568e7422e8cd77a46f1966 Mon Sep 17 00:00:00 2001 From: thickbrick Date: Sat, 25 Sep 2010 16:18:20 +0200 Subject: Context translator: default to enabled. Set the default of the xui attribute "allow_translate" to true, and add allow_translate="false" to panel_login.xml. This probably needs to be disabled in other places as well. --- linden/indra/llui/lllineeditor.cpp | 4 ++-- linden/indra/llui/lltexteditor.cpp | 2 +- linden/indra/newview/skins/default/xui/en-us/panel_login.xml | 9 ++++++--- 3 files changed, 9 insertions(+), 6 deletions(-) (limited to 'linden') diff --git a/linden/indra/llui/lllineeditor.cpp b/linden/indra/llui/lllineeditor.cpp index 05966d6..8d88ce9 100644 --- a/linden/indra/llui/lllineeditor.cpp +++ b/linden/indra/llui/lllineeditor.cpp @@ -176,7 +176,7 @@ LLLineEditor::LLLineEditor(const std::string& name, const LLRect& rect, mReplaceNewlinesWithSpaces( TRUE ), mSpellCheckable( FALSE ), mShowMisspellings(FALSE), - mAllowTranslate(FALSE) + mAllowTranslate(TRUE) { llassert( max_length_bytes > 0 ); @@ -2885,7 +2885,7 @@ LLView* LLLineEditor::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory { line_editor->setSpellCheckable(spell_checking); } - BOOL allow_translate = FALSE; + BOOL allow_translate = TRUE; if (node->getAttributeBOOL("allow_translate", allow_translate)) { line_editor->setAllowTranslate(allow_translate); diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp index d59eed6..5ee94c8 100644 --- a/linden/indra/llui/lltexteditor.cpp +++ b/linden/indra/llui/lltexteditor.cpp @@ -331,7 +331,7 @@ LLTextEditor::LLTextEditor( mScrollNeeded(FALSE), mSpellCheckable(FALSE), mShowMisspellings(FALSE), - mAllowTranslate(FALSE) + mAllowTranslate(TRUE) { mSourceID.generate(); diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml index dda5e4d..96f3f77 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml @@ -58,7 +58,8 @@ bevel_style="in" border_style="line" border_thickness="1" max_length="31" mouse_opaque="true" handle_edit_keys_directly="true" - select_all_on_focus_received="true" /> + select_all_on_focus_received="true" + allow_translate="false" /> @@ -77,7 +78,8 @@ bevel_style="in" border_style="line" border_thickness="1" max_length="31" mouse_opaque="true" handle_edit_keys_directly="true" - select_all_on_focus_received="true" /> + select_all_on_focus_received="true" + allow_translate="false" /> @@ -96,7 +98,8 @@ bevel_style="in" border_style="line" border_thickness="1" max_length="16" mouse_opaque="true" handle_edit_keys_directly="true" - select_all_on_focus_received="true" /> + select_all_on_focus_received="true" + allow_translate="false" />