diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2013-06-18 20:43:18 +0300 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2013-06-18 20:43:18 +0300 |
| commit | f922605ec68aace1ac9f039efc4b497a315326e8 (patch) | |
| tree | e78bdd47a555f680d36b620575dae3b558ca0b4d /indra | |
| parent | 8d82ebc6c8682577060b1d0e960b3be810dacb39 (diff) | |
CHUI-979 FIXED Clear highlight after clicking in chat input. Do not flash chat button if current conversation is focused and torned off.
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/llfloaterimsessiontab.cpp | 1 | ||||
| -rwxr-xr-x | indra/newview/llimview.cpp | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp index 559e9ab23f..0ccfdb9a7b 100755 --- a/indra/newview/llfloaterimsessiontab.cpp +++ b/indra/newview/llfloaterimsessiontab.cpp @@ -407,6 +407,7 @@ void LLFloaterIMSessionTab::onInputEditorClicked() { im_box->flashConversationItemWidget(mSessionID,false); } + gToolBarView->flashCommand(LLCommandId("chat"), false); } std::string LLFloaterIMSessionTab::appendTime() diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index b43e9296f9..afe1f72019 100755 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -173,7 +173,7 @@ void notify_of_message(const LLSD& msg, bool is_dnd_msg) LLFloaterIMContainer* im_box = LLFloaterReg::getTypedInstance<LLFloaterIMContainer>("im_container"); LLFloaterIMSessionTab* session_floater = LLFloaterIMSessionTab::getConversation(session_id); bool store_dnd_message = false; // flag storage of a dnd message - + bool is_session_focused = session_floater->isTornOff() && session_floater->hasFocus(); if (!LLFloater::isVisible(im_box) || im_box->isMinimized()) { conversations_floater_status = CLOSED; @@ -329,6 +329,7 @@ void notify_of_message(const LLSD& msg, bool is_dnd_msg) if (("toast" == user_preferences || "flash" == user_preferences) && (CLOSED == conversations_floater_status || NOT_ON_TOP == conversations_floater_status) + && !is_session_focused && !is_dnd_msg) //prevent flashing FUI button because the conversation floater will have already opened { if(!LLMuteList::getInstance()->isMuted(participant_id)) |