Merge branch 'weekly' of git://github.com/mccabe/imprudence into weekly

6 files changed, 62 insertions, 36 deletions

diff --git a/linden/indra/newview/lgghunspell_wrapper.cpp b/linden/indra/newview/lgghunspell_wrapper.cpp
index f800043..aa4507c 100644
--- a/linden/indra/newview/lgghunspell_wrapper.cpp
+++ b/linden/indra/newview/lgghunspell_wrapper.cpp
@@ -72,7 +72,7 @@ static char * countryCodesraw[] = {
   (char*)"CF",(char*)"Central African Republic",
   (char*)"CG",(char*)"Congo",
   (char*)"CH",(char*)"Switzerland",
-  (char*)"CI",(char*)"Côte D'ivoire (Ivory Coast)",
+  (char*)"CI",(char*)"Côte D'ivoire (Ivory Coast)",
   (char*)"CK",(char*)"Cook Iislands",
   (char*)"CL",(char*)"Chile",
   (char*)"CM",(char*)"Cameroon",
@@ -212,7 +212,7 @@ static char * countryCodesraw[] = {
   (char*)"PW",(char*)"Palau",
   (char*)"PY",(char*)"Paraguay",
   (char*)"QA",(char*)"Qatar",
-  (char*)"RE",(char*)"Réunion",
+  (char*)"RE",(char*)"Réunion",
   (char*)"RO",(char*)"Romania",
   (char*)"RU",(char*)"Russian Federation",
   (char*)"RW",(char*)"Rwanda",
@@ -333,7 +333,7 @@ static char * languageCodesraw[]={
   (char*)"ga",(char*)"Irish",
   (char*)"gd",(char*)"Gaelic",
   (char*)"gl",(char*)"Galician",
-  (char*)"gn",(char*)"Guaraní",
+  (char*)"gn",(char*)"Guaraní",
   (char*)"gu",(char*)"Gujarati",
   (char*)"gv",(char*)"Manx",
   (char*)"ha",(char*)"Hausa",
@@ -456,7 +456,7 @@ static char * languageCodesraw[]={
   (char*)"uz",(char*)"Uzbek",
   (char*)"ve",(char*)"Venda",
   (char*)"vi",(char*)"Vietnamese",
-  (char*)"vo",(char*)"Volapük",
+  (char*)"vo",(char*)"Volapük",
   (char*)"wa",(char*)"Walloon",
   (char*)"wo",(char*)"Wolof",
   (char*)"xh",(char*)"Xhosa",
@@ -470,10 +470,9 @@ static char * languageCodesraw[]={
 #define LANGUAGE_CODES_RAW_SIZE 368
 
 lggHunSpell_Wrapper::lggHunSpell_Wrapper()
-        :
-        mSpellCheckHighlight(false)
 {
         //languageCodes(begin(languageCodesraw), end(languageCodesraw));    
+        mSpellCheckHighlight = rebind_llcontrol<BOOL>("EmeraldSpellDisplay", &gSavedSettings, false);
 }
 
 lggHunSpell_Wrapper::~lggHunSpell_Wrapper()
@@ -638,8 +637,6 @@ void lggHunSpell_Wrapper::processSettings()
         //expects everything to already be in saved settings
         //this will also reload and read the installed dicts
         setNewDictionary(gSavedSettings.getString("EmeraldSpellBase"));
-        mSpellCheckHighlight = gSavedSettings.getBOOL("EmeraldSpellDisplay");
-        
 }
 
 void lggHunSpell_Wrapper::addDictionary(std::string additionalDictionary)
@@ -966,5 +963,8 @@ void lggHunSpell_Wrapper::editCustomButton()
 
 void lggHunSpell_Wrapper::setSpellCheckHighlight(BOOL highlight)
 {
-        mSpellCheckHighlight = highlight;
+        if (mSpellCheckHighlight)
+        {
+                *mSpellCheckHighlight = highlight;
+        }
 }
diff --git a/linden/indra/newview/lgghunspell_wrapper.h b/linden/indra/newview/lgghunspell_wrapper.h
index b5f3ddb..71b2f14 100644
--- a/linden/indra/newview/lgghunspell_wrapper.h
+++ b/linden/indra/newview/lgghunspell_wrapper.h
@@ -55,7 +55,7 @@ public:
         std::string VEC2CSV(std::vector<std::string> vec);
 
         void setSpellCheckHighlight(BOOL highlight);
-        BOOL getSpellCheckHighlight() { return mSpellCheckHighlight; }
+        BOOL getSpellCheckHighlight() { return mSpellCheckHighlight && *mSpellCheckHighlight; }
 
 private:
         void createCustomDic();
@@ -67,7 +67,7 @@ private:
         std::string currentBaseDic;
         //std::vector<std::string> languageCodes;
         //std::vector<std::string> countryCodes;
-        BOOL mSpellCheckHighlight;
+        BOOL* mSpellCheckHighlight;
 };
 
 extern lggHunSpell_Wrapper* glggHunSpell; // the singleton hunspell wrapper
diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp
index 30b0a4a..0f999fc 100644
--- a/linden/indra/newview/llinventorybridge.cpp
+++ b/linden/indra/newview/llinventorybridge.cpp
@@ -3107,7 +3107,27 @@ void LLNotecardBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
                         }
                         items.push_back(std::string("Edit WindLight Settings"));
                 }
+                else
+                {
+                        items.push_back(std::string("Open"));
+                }
                 items.push_back(std::string("Properties"));
+
+                // RLVa stuff copied from LLInvFVBridge::buildContextMenu
+                // [RLVa:KB] - Checked: 2009-10-13 (RLVa-1.0.5c) | Modified: RLVa-1.0.5c
+                if (rlv_handler_t::isEnabled())
+                {
+                        LLInventoryObject* pItem = (mInventoryPanel->getModel()) ? mInventoryPanel->getModel()->getObject(mUUID) : NULL;
+                        if ( (pItem) &&
+                                 ( ((LLAssetType::AT_NOTECARD == pItem->getType()) && (gRlvHandler.hasBehaviour(RLV_BHVR_VIEWNOTE))) ||
+                                   ((LLAssetType::AT_LSL_TEXT == pItem->getType()) && (gRlvHandler.hasBehaviour(RLV_BHVR_VIEWSCRIPT))) ||
+                                   ((LLAssetType::AT_NOTECARD == pItem->getType()) && (gRlvHandler.hasBehaviour(RLV_BHVR_VIEWTEXTURE))) ) )
+                        {
+                                disabled_items.push_back(std::string("Open"));
+                        }
+                }
+                // [/RLVa:KB]
+
                 getClipboardEntries(true, items, disabled_items, flags);
         }
         hideContextEntries(menu, items, disabled_items);
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 8fa0f64..52113ce 100755
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -2717,43 +2717,46 @@ void process_decline_callingcard(LLMessageSystem* msg, void**)
 class ChatTranslationReceiver : public LLTranslate::TranslationReceiver
 {
 public :
-        ChatTranslationReceiver(const std::string &fromLang, const std::string &toLang, LLChat *chat,
-                const BOOL history)
+        ChatTranslationReceiver(const std::string &fromLang, const std::string &toLang, const LLChat &chat,
+                const std::string &orig_mesg, const BOOL history)
                 : LLTranslate::TranslationReceiver(fromLang, toLang),
                 m_chat(chat),
+                m_origMesg(orig_mesg),
                 m_history(history)
         {
         }
 
-        static boost::intrusive_ptr<ChatTranslationReceiver> build(const std::string &fromLang, const std::string &toLang, LLChat *chat, const BOOL history)
+        static boost::intrusive_ptr<ChatTranslationReceiver> build(const std::string &fromLang, const std::string &toLang, const LLChat &chat, const std::string &orig_mesg, const BOOL history)
         {
-                return boost::intrusive_ptr<ChatTranslationReceiver>(new ChatTranslationReceiver(fromLang, toLang, chat, history));
+                return boost::intrusive_ptr<ChatTranslationReceiver>(new ChatTranslationReceiver(fromLang, toLang, chat, orig_mesg, history));
         }
 
 protected:
-        void handleResponse(const std::string &translation, const std::string &detectedLanguage)
+        void handleResponse(const std::string &translation, const std::string &detected_language)
         {
-                if (m_toLang != detectedLanguage)
-                        m_chat->mText += " (" + translation + ")";
-
-                add_floater_chat(*m_chat, m_history);
+                // filter out non-interesting responeses
+                if ( !translation.empty()
+                        && (m_toLang != detected_language)
+                        && (LLStringUtil::compareInsensitive(translation, m_origMesg) != 0) )
+                {
+                        m_chat.mText += " (" + translation + ")";
+                }
 
-                delete m_chat;
+                add_floater_chat(m_chat, m_history);
         }
 
         void handleFailure()
         {
                 LLTranslate::TranslationReceiver::handleFailure();
 
-                m_chat->mText += " (?)";
+                m_chat.mText += " (?)";
 
-                add_floater_chat(*m_chat, m_history);
-
-                delete m_chat;
+                add_floater_chat(m_chat, m_history);
         }
 
 private:
-        LLChat *m_chat;
+        LLChat m_chat;
+        std::string m_origMesg;
         const BOOL m_history;
 };
 
@@ -2771,9 +2774,9 @@ void add_floater_chat(const LLChat &chat, const BOOL history)
         }
 }
 
-void check_translate_chat(const std::string &mesg, LLChat &chat, const BOOL history)
+void check_translate_chat(const std::string &mesg, const LLChat &chat, const BOOL history)
 {
-        const bool translate = LLUI::sConfigGroup->getBOOL("TranslateChat");
+        const bool translate = gSavedSettings.getBOOL("TranslateChat");
 
         if (translate && chat.mSourceType != CHAT_SOURCE_SYSTEM)
         {
@@ -2781,9 +2784,8 @@ void check_translate_chat(const std::string &mesg, LLChat &chat, const BOOL hist
                 // SVC-4879
                 const std::string &fromLang = "";
                 const std::string &toLang = LLTranslate::getTranslateLanguage();
-                LLChat *newChat = new LLChat(chat);
 
-                LLHTTPClient::ResponderPtr result = ChatTranslationReceiver::build(fromLang, toLang, newChat, history);
+                LLHTTPClient::ResponderPtr result = ChatTranslationReceiver::build(fromLang, toLang, chat, mesg, history);
                 LLTranslate::translateMessage(result, fromLang, toLang, mesg);
         }
         else
@@ -2962,8 +2964,9 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                 std::string prefix = mesg.substr(0, 4);
                 if (prefix == "/me " || prefix == "/me'")
                 {
-                        chat.mText = from_name;
-                        chat.mText += mesg.substr(3);
+                        const std::string spacer = mesg.substr(3,1);
+                        mesg = mesg.substr(4);
+                        chat.mText = from_name + spacer + mesg;
                         ircstyle = TRUE;
                 }
                 else
diff --git a/linden/indra/newview/llviewermessage.h b/linden/indra/newview/llviewermessage.h
index 1a6c03b..11a3554 100644
--- a/linden/indra/newview/llviewermessage.h
+++ b/linden/indra/newview/llviewermessage.h
@@ -76,7 +76,7 @@ void process_script_question(LLMessageSystem *msg, void **user_data);
 void process_chat_from_simulator(LLMessageSystem *mesgsys, void **user_data);
 
 void add_floater_chat(const LLChat &chat, const BOOL history);
-void check_translate_chat(const std::string &mesg, LLChat &chat, const BOOL history);
+void check_translate_chat(const std::string &mesg, const LLChat &chat, const BOOL history);
 
 //void process_agent_to_new_region(LLMessageSystem *mesgsys, void **user_data);
 void send_agent_update(BOOL force_send, BOOL send_reliable = FALSE);
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" />
 
 
   <!-- LAST NAME -->
@@ -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" />
 
 
   <!-- PASSWORD -->
@@ -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" />
         <check_box name="remember_check" label="Remember password"
              bottom_delta="-24" left_delta="0" height="16" width="140"
              follows="left|bottom" font="SansSerifSmall" control_name="RememberPassword"