diff options
| author | simon <none@none> | 2014-05-07 13:19:05 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-05-07 13:19:05 -0700 |
| commit | dc4c184696b308b8f60fa1dd751b35e22bd47d62 (patch) | |
| tree | 1606d992f1cce6fe19572042c456725eb95d7066 /indra/newview/llconversationview.cpp | |
| parent | 883467a3cc421fca68a25589114e0e3f0538ff0e (diff) | |
| parent | 250db74bf9325acdc1169f6c13d297e7fe44b753 (diff) | |
Merge downstream version 3.7.8 code
Diffstat (limited to 'indra/newview/llconversationview.cpp')
| -rw-r--r-- | indra/newview/llconversationview.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp index 90800fee58..4250aeacd6 100644 --- a/indra/newview/llconversationview.cpp +++ b/indra/newview/llconversationview.cpp @@ -127,10 +127,11 @@ void LLConversationViewSession::setHighlightState(bool hihglight_state) void LLConversationViewSession::startFlashing() { - LLFloaterIMContainer* im_box = LLFloaterReg::getTypedInstance<LLFloaterIMContainer>("im_container"); - // Need to start flashing only when "Conversations" is opened or brought on top - if (isInVisibleChain() && !im_box->isMinimized() && mFlashStateOn && !mFlashStarted) + if (isInVisibleChain() + && mFlashStateOn + && !mFlashStarted + && ! LLFloaterReg::getTypedInstance<LLFloaterIMContainer>("im_container")->isMinimized() ) { mFlashStarted = true; mFlashTimer->startFlashing(); |