rename translate debug setting to better force off.

Tue, 06 Mar 2012 11:53:44 -0800

author
Tank_Master
date
Tue, 06 Mar 2012 11:53:44 -0800
changeset 1659
59082f7329bc
parent 1658
bf53ee5c6607
child 1660
9dfd7b7c426b
child 1668
a441202824f2

rename translate debug setting to better force off.

indra/llui/lllineeditor.cpp file | annotate | diff | revisions
indra/llui/lltexteditor.cpp file | annotate | diff | revisions
indra/newview/app_settings/settings.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/en-us/panel_preferences_phoenix.xml file | annotate | diff | revisions
     1.1 --- a/indra/llui/lllineeditor.cpp	Sat Mar 03 20:03:44 2012 -0800
     1.2 +++ b/indra/llui/lllineeditor.cpp	Tue Mar 06 11:53:44 2012 -0800
     1.3 @@ -109,7 +109,7 @@
     1.4  protected:
     1.5  	void handleResponse(const std::string &translation, const std::string &detectedLanguage)
     1.6  	{
     1.7 -		static LLCachedControl<bool> rep(gSavedSettings, "PhoenixTranslateReplace");
     1.8 +		static LLCachedControl<bool> rep(gSavedSettings, "PhoenixTranslateReplace2");
     1.9  		if(rep)
    1.10  			m_line->deleteSelection();
    1.11  		m_line->insert((rep?"":" (") + translation + (rep?"":")"),m_line->getCursor());
     2.1 --- a/indra/llui/lltexteditor.cpp	Sat Mar 03 20:03:44 2012 -0800
     2.2 +++ b/indra/llui/lltexteditor.cpp	Tue Mar 06 11:53:44 2012 -0800
     2.3 @@ -118,7 +118,7 @@
     2.4  protected:
     2.5  	void handleResponse(const std::string &translation, const std::string &detectedLanguage)
     2.6  	{
     2.7 -		BOOL rep = gSavedSettings.getBOOL("PhoenixTranslateReplace");
     2.8 +		BOOL rep = gSavedSettings.getBOOL("PhoenixTranslateReplace2");
     2.9  		m_line->insertText((rep?"":" (") + translation +(rep?"":")"),rep);
    2.10  	}
    2.11  	void handleFailure()
     3.1 --- a/indra/newview/app_settings/settings.xml	Sat Mar 03 20:03:44 2012 -0800
     3.2 +++ b/indra/newview/app_settings/settings.xml	Tue Mar 06 11:53:44 2012 -0800
     3.3 @@ -10254,7 +10254,7 @@
     3.4  			<key>Value</key>
     3.5  			<integer>1</integer>
     3.6  		</map>
     3.7 -		<key>PhoenixTranslateReplace</key>
     3.8 +		<key>PhoenixTranslateReplace2</key>
     3.9  		<map>
    3.10  			<key>Comment</key>
    3.11  			<string>Whether or not right click tranlate replaces the selected text or adds to it.</string>
     4.1 --- a/indra/newview/skins/default/xui/en-us/panel_preferences_phoenix.xml	Sat Mar 03 20:03:44 2012 -0800
     4.2 +++ b/indra/newview/skins/default/xui/en-us/panel_preferences_phoenix.xml	Tue Mar 06 11:53:44 2012 -0800
     4.3 @@ -106,7 +106,7 @@
     4.4          <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16" initial_value="false" label="Disable ALL group chats" left_delta="0" mouse_opaque="true" name="PhoenixMuteAllGroups-toggle" radio_style="false" width="270" control_name="PhoenixMuteAllGroups"/>
     4.5          <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16" initial_value="false" label="Notify me when a group chat is muted" left_delta="0" mouse_opaque="true" name="PhoenixNotifyWhenMutingGroupChat-toggle" radio_style="false" width="270" control_name="PhoenixNotifyWhenMutingGroupChat"/>
     4.6          <!-- Google translate changed their API, disabling the control for now.
     4.7 -        <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16" label="Right click translate also replaces selected text" left_delta="0" mouse_opaque="true" name="PhoenixTranslateReplace" radio_style="false" width="270" control_name="PhoenixTranslateReplace"/>
     4.8 +        <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16" label="Right click translate also replaces selected text" left_delta="0" mouse_opaque="true" name="PhoenixTranslateReplace" radio_style="false" width="270" control_name="PhoenixTranslateReplace2"/>
     4.9          -->
    4.10          <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16" label="Use 'You' instead of your name in your own chat" left_delta="0" mouse_opaque="true" name="PhoenixUseYou" radio_style="false" width="270" control_name="PhoenixUseYou"/>
    4.11          <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16" label="Make moderators' chat text bold in group chats" left_delta="0" mouse_opaque="true" name="PhoenixBoldGroupMods" radio_style="false" width="270" control_name="PhoenixBoldGroupMods"/>

mercurial