6 files changed, 148 insertions, 8 deletions

diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index b14930b..f7ff3f9 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -108,6 +108,8 @@ LLFloaterChat::LLFloaterChat(const LLSD& seed)
         LLUICtrlFactory::getInstance()->buildFloater(this,"floater_chat_history.xml",&getFactoryMap(),no_open);
 
         childSetCommitCallback("show mutes",onClickToggleShowMute,this); //show mutes
+        childSetCommitCallback("translate chat",onClickToggleTranslateChat,this);
+        childSetValue("translate chat", gSavedSettings.getBOOL("TranslateChat"));
         childSetVisible("Chat History Editor with mute",FALSE);
         childSetAction("toggle_active_speakers_btn", onClickToggleActiveSpeakers, this);
         setDefaultBtn("Chat");
@@ -429,6 +431,26 @@ void LLFloaterChat::onClickToggleShowMute(LLUICtrl* caller, void *data)
         }
 }
 
+// Update the "TranslateChat" pref after "translate chat" checkbox is toggled in
+// the "Local Chat" floater.
+//static
+void LLFloaterChat::onClickToggleTranslateChat(LLUICtrl* caller, void *data)
+{
+        LLFloaterChat* floater = (LLFloaterChat*)data;
+
+        BOOL translate_chat = floater->getChild<LLCheckBoxCtrl>("translate chat")->get();
+        gSavedSettings.setBOOL("TranslateChat", translate_chat);
+}
+
+// Update the "translate chat" checkbox after the "TranslateChat" pref is set in
+// some other place (e.g. prefs dialog).
+//static
+void LLFloaterChat::updateSettings()
+{
+        BOOL translate_chat = gSavedSettings.getBOOL("TranslateChat");
+        LLFloaterChat::getInstance(LLSD())->getChild<LLCheckBoxCtrl>("translate chat")->set(translate_chat);
+}
+
 // Put a line of chat in all the right places
 void LLFloaterChat::addChat(const LLChat& chat, 
                           BOOL from_instant_message, 
diff --git a/linden/indra/newview/llfloaterchat.h b/linden/indra/newview/llfloaterchat.h
index e2bb54c..f894675 100644
--- a/linden/indra/newview/llfloaterchat.h
+++ b/linden/indra/newview/llfloaterchat.h
@@ -65,6 +65,7 @@ public:
         virtual void onVisibilityChange(BOOL cur_visibility);
         virtual void setMinimized(BOOL);
         void updateConsoleVisibility();
+        void updateSettings();
 
         static void setHistoryCursorAndScrollToEnd();
         
@@ -77,6 +78,7 @@ public:
         
         static void onClickMute(void *data);
         static void onClickToggleShowMute(LLUICtrl* caller, void *data);
+        static void onClickToggleTranslateChat(LLUICtrl* caller, void *data);
         static void onClickToggleActiveSpeakers(void* userdata);
         static void chatFromLogFile(LLLogChat::ELogLineType type,std::string line, void* userdata);
         static void loadHistory();
diff --git a/linden/indra/newview/llprefschat.cpp b/linden/indra/newview/llprefschat.cpp
index 2e08cac..b4614b8 100644
--- a/linden/indra/newview/llprefschat.cpp
+++ b/linden/indra/newview/llprefschat.cpp
@@ -76,6 +76,8 @@ private:
         BOOL mChatChannel;
         F32     mConsoleOpacity;
         F32     mBubbleOpacity;
+        std::string mTranslateLanguage;
+        BOOL mTranslateChat;
 };
 
 LLPrefsChatImpl::LLPrefsChatImpl()
@@ -110,6 +112,8 @@ LLPrefsChatImpl::LLPrefsChatImpl()
         childSetValue("toggle_channel_control", gSavedSettings.getBOOL("ChatChannelSelect"));
         childSetValue("console_opacity", gSavedSettings.getF32("ConsoleBackgroundOpacity"));
         childSetValue("bubble_chat_opacity", gSavedSettings.getF32("ChatBubbleOpacity"));
+        childSetValue("translate_language_combobox",    gSavedSettings.getString("TranslateLanguage"));
+        childSetValue("translate_chat",         gSavedSettings.getBOOL("TranslateChat"));
 }
 
 void LLPrefsChatImpl::refreshValues()
@@ -137,6 +141,8 @@ void LLPrefsChatImpl::refreshValues()
         mChatChannel = gSavedSettings.getBOOL("ChatChannelSelect");
         mConsoleOpacity = gSavedSettings.getF32("ConsoleBackgroundOpacity");
         mBubbleOpacity = gSavedSettings.getF32("ChatBubbleOpacity");
+        mTranslateLanguage = gSavedSettings.getString("TranslateLanguage");
+        mTranslateChat = gSavedSettings.getBOOL("TranslateChat");
 }
 
 void LLPrefsChatImpl::cancel()
@@ -163,6 +169,8 @@ void LLPrefsChatImpl::cancel()
         gSavedSettings.setBOOL("ChatChannelSelect", mChatChannel); 
         gSavedSettings.setF32("ConsoleBackgroundOpacity", mConsoleOpacity);
         gSavedSettings.setF32("ChatBubbleOpacity", mBubbleOpacity);     
+        gSavedSettings.setString("TranslateLanguage", mTranslateLanguage);      
+        gSavedSettings.setBOOL("TranslateChat", mTranslateChat);
 }
 
 void LLPrefsChatImpl::apply()
@@ -194,6 +202,9 @@ void LLPrefsChatImpl::apply()
         gSavedSettings.setF32("ConsoleBackgroundOpacity", childGetValue("console_opacity").asReal());
         gSavedSettings.setF32("ChatBubbleOpacity", childGetValue("bubble_chat_opacity").asReal());
 
+        gSavedSettings.setString("TranslateLanguage", childGetValue("translate_language_combobox"));
+        gSavedSettings.setBOOL("TranslateChat", childGetValue("translate_chat"));
+
         BOOL chan_check = childGetValue("toggle_channel_control");
         gSavedSettings.setBOOL("ChatChannelSelect", chan_check);
         if (mChatChannel != chan_check)
diff --git a/linden/indra/newview/llviewercontrol.cpp b/linden/indra/newview/llviewercontrol.cpp
index e1507d4..a73d0ab 100644
--- a/linden/indra/newview/llviewercontrol.cpp
+++ b/linden/indra/newview/llviewercontrol.cpp
@@ -71,6 +71,7 @@
 #include "llrender.h"
 #include "llmediamanager.h"
 #include "llslider.h"
+#include "llfloaterchat.h"
 
 
 #ifdef TOGGLE_HACKED_GODLIKE_VIEWER
@@ -485,6 +486,32 @@ bool handleVoiceClientPrefsChanged(const LLSD& newvalue)
         return true;
 }
 
+bool handleTranslateChatPrefsChanged(const LLSD& newvalue)
+{
+        LLFloaterChat* floaterp = LLFloaterChat::getInstance();
+
+        if(floaterp)
+        {
+                // update "translate chat" pref in "Local Chat" floater
+                floaterp->updateSettings();
+        }
+        return true;
+}
+
+// [RLVa:KB] - Checked: 2009-08-11 (RLVa-1.0.1h) | Added: RLVa-1.0.1h
+bool rlvHandleEnableLegacyNamingChanged(const LLSD& newvalue)
+{
+        rlv_handler_t::fLegacyNaming = newvalue.asBoolean();
+        return true;
+}
+
+bool rlvHandleShowNameTagsChanged(const LLSD& newvalue)
+{
+        RlvSettings::fShowNameTags = newvalue.asBoolean();
+        return true;
+}
+// [/RLVa:KB]
+
 bool handleMediaDebugLevelChanged(const LLSD& newvalue)
 {
         LLMediaManager *mgr = LLMediaManager::getInstance();
@@ -663,7 +690,8 @@ void settings_setup_listeners()
         gSavedSettings.getControl("LipSyncEnabled")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));     
         gSavedSettings.getControl("MediaDebugLevel")->getSignal()->connect(boost::bind(&handleMediaDebugLevelChanged, _1));     
         gSavedSettings.getControl("SliderScrollWheelMultiplier")->getSignal()->connect(boost::bind(&handleSliderScrollWheelMultiplierChanged, _1));     
-
+        gSavedSettings.getControl("TranslateChat")->getSignal()->connect(boost::bind(&handleTranslateChatPrefsChanged, _1));    
+        
 // [RLVa:KB] - Checked: 2009-08-11 (RLVa-1.0.1h) | Added: RLVa-1.0.1h
         if (gSavedSettings.controlExists(RLV_SETTING_ENABLELEGACYNAMING))
                 gSavedSettings.getControl(RLV_SETTING_ENABLELEGACYNAMING)->getSignal()->connect(boost::bind(&rlvHandleEnableLegacyNamingChanged, _1));
@@ -751,7 +779,6 @@ template <> eControlType get_control_type<LLSD>(const LLSD& in, LLSD& out)
         return TYPE_LLSD; 
 }
 
-
 #if TEST_CACHED_CONTROL
 
 #define DECL_LLCC(T, V) static LLCachedControl<T> mySetting_##T("TestCachedControl"#T, V)
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
index 54c146d..2e6fee4 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
@@ -65,9 +65,9 @@
       Control your camera
   </string>
 
-  <layout_stack border="false" bottom="2" follows="left|top|right|bottom" height="250" left="2"
+  <layout_stack border="false" bottom="2" follows="left|top|right|bottom" height="255" left="2"
              orientation="horizontal" width="430" name="panels">
-                <layout_panel border="false" bottom="0" default_tab_group="1" height="130" left="0"
+                <layout_panel border="false" bottom="0" default_tab_group="1" height="135" left="0"
                      min_width="275" name="im_contents_panel" width="305">
                         <combo_box follows="left|top" height="20" label="Gestures" left="5" name="Gesture"
                              width="120">
@@ -75,10 +75,13 @@
                                         Gestures
                                 </combo_item>
                         </combo_box>
-                        <check_box bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall"
-                             height="20" initial_value="false" label="Show muted text" left_delta="125"
+                        <check_box bottom_delta="7" enabled="true" follows="left|top" font="SansSerifSmall"
+                             height="20" initial_value="false" label="Show Muted Text" left_delta="125"
                              name="show mutes" radio_style="false" width="116" />
-                        <button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;"
+                        <check_box bottom_delta="-15" enabled="true" follows="left|top" font="SansSerifSmall"
+                             height="20" initial_value="false" label="Translate Chat (powered by Google)" left_delta="0"
+                             name="translate chat" radio_style="false" width="100" />
+                        <button bottom_delta="7" follows="right|top" height="20" label="&lt; &lt;"
                              label_selected="&gt; &gt;" left="272" name="toggle_active_speakers_btn"
                              right="305"
                              tool_tip="Click here to show list of active participants in this IM session."
@@ -107,7 +110,7 @@
         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="0"
                                      enabled="true" follows="left|right|bottom" font="SansSerif"
                                      handle_edit_keys_directly="false" height="20" label="Click here to chat."
-                                     left="0" max_length="254" mouse_opaque="true" name="Chat Editor"
+                                     left="105" max_length="2147483647" mouse_opaque="true" name="Chat Editor"
                                      right="-70" select_all_on_focus_received="false" select_on_focus="false"
                                      tab_group="1" />
                                 <flyout_button bottom="0" follows="right|bottom" height="20" label="Say" left="-65"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
index 61c6b23..95d0c33 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
@@ -162,4 +162,79 @@
              increment="0.05" initial_val="1" label="Bubble opacity:" left="148" max_val="1"
              min_val="0" mouse_opaque="true" name="bubble_chat_opacity" show_text="true"
              value="0.5" width="225" />
+
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="-420" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
+             mouse_opaque="false" name="text_translate_chat" v_pad="0" width="128">
+                Translate Chat:
+        </text>
+        <check_box bottom="-427" control_name="TranslateChat" enabled="true" follows="left|top"
+             font="SansSerifSmall" height="16" initial_value="false"
+             label="Use machine translation while chatting (powered by Google)" left="148" mouse_opaque="true"
+             name="translate_chat" radio_style="false" width="237" />
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="-442" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="149"
+             mouse_opaque="false" name="text_translate_chat" v_pad="0" width="160">
+                Translate into this language:
+        </text> 
+        <combo_box allow_text_entry="true" bottom="-448" enabled="true"
+             follows="left|top" height="16" left_delta="183" max_chars="135"
+             mouse_opaque="true" name="translate_language_combobox" width="146">
+                <combo_item type="string" length="1" enabled="true" name="System Default Language" value="default">
+                        System Default
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="English" value="en">
+                        English
+                </combo_item>
+                
+                <!-- After "System Default" and "English", please keep the rest of these combo_items in alphabetical order by the first character in the string. -->
+                
+                <combo_item type="string" length="1" enabled="true" name="Danish" value="da">
+                        Dansk (Danish)
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="Deutsch(German)" value="de">
+                        Deutsch (German)
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="Spanish" value="es">
+                        Español (Spanish)
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="French" value="fr">
+                        Français (French)
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="Italian" value="it">
+                        Italiano (Italian)
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="Hungarian" value="hu">
+                        Magyar (Hungarian)
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="Dutch" value="nl">
+                        Nederlands (Dutch)
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="Polish" value="pl">
+                        Polski (Polish)
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="Portugese" value="pt">
+                        Portugués (Portuguese)
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="Russian" value="ru">
+                        Русский (Russian)
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="Turkish" value="tr">
+                        Türkçe (Turkish)
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="Ukrainian" value="uk">
+                        Українська (Ukrainian)
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="Chinese" value="zh">
+                        中文 (简体) (Chinese)
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="(Japanese)" value="ja">
+                        日本語 (Japanese)
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="(Korean)" value="ko">
+                        한국어 (Korean)
+                </combo_item>
+        </combo_box>
 </panel>