summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAlexanderP ProductEngine <apaschenko@productengine.com>2012-06-18 23:20:17 +0300
committerAlexanderP ProductEngine <apaschenko@productengine.com>2012-06-18 23:20:17 +0300
commit7edcbb1613d30f9fecf3ccbe342d45b7761f5b56 (patch)
treef9f12ff14ee04a5ec88c9f7ce6a13ab130b63d67 /indra
parentbc5e0eda1b1b9c289734bebe6a533565aadfd3a2 (diff)
CHUI-100 WIP Fix translate chat checkbox showing
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llimconversation.cpp7
-rw-r--r--indra/newview/llimconversation.h3
-rw-r--r--indra/newview/llnearbychat.cpp4
-rw-r--r--indra/newview/llnearbychat.h1
4 files changed, 10 insertions, 5 deletions
diff --git a/indra/newview/llimconversation.cpp b/indra/newview/llimconversation.cpp
index 3e2b208874..ead87e3ed5 100644
--- a/indra/newview/llimconversation.cpp
+++ b/indra/newview/llimconversation.cpp
@@ -236,6 +236,13 @@ void LLIMConversation::updateHeaderAndToolbar()
mCloseBtn->setVisible(is_hosted);
enableDisableCallBtn();
+
+ showTranslationCheckbox();
+}
+
+void LLIMConversation::showTranslationCheckbox(BOOL show)
+{
+ getChild<LLUICtrl>("translate_chat_checkbox_lp")->setVisible(mIsNearbyChat? show : FALSE);
}
// static
diff --git a/indra/newview/llimconversation.h b/indra/newview/llimconversation.h
index d31ae0808a..66401b9a3c 100644
--- a/indra/newview/llimconversation.h
+++ b/indra/newview/llimconversation.h
@@ -56,6 +56,9 @@ public:
*/
static bool isChatMultiTab();
+ // show/hide the translation check box
+ void showTranslationCheckbox(const BOOL visible = FALSE);
+
// LLFloater overrides
/*virtual*/ void onOpen(const LLSD& key);
/*virtual*/ BOOL postBuild();
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp
index e4b891889c..1b2d9b6801 100644
--- a/indra/newview/llnearbychat.cpp
+++ b/indra/newview/llnearbychat.cpp
@@ -393,10 +393,6 @@ void LLNearbyChat::showHistory()
storeRectControl();
}
-void LLNearbyChat::showTranslationCheckbox(BOOL show)
-{
- getChild<LLUICtrl>("translate_chat_checkbox_lp")->setVisible(show);
-}
BOOL LLNearbyChat::tick()
{
diff --git a/indra/newview/llnearbychat.h b/indra/newview/llnearbychat.h
index bc0e54de15..3dc94ce0da 100644
--- a/indra/newview/llnearbychat.h
+++ b/indra/newview/llnearbychat.h
@@ -87,7 +87,6 @@ public:
static void sendChatFromViewer(const LLWString &wtext, EChatType type, BOOL animate);
void showHistory();
- void showTranslationCheckbox(BOOL show);
protected:
static BOOL matchChatTypeTrigger(const std::string& in_str, std::string* out_str);