diff options
| author | Richard Linden <none@none> | 2014-02-24 18:45:59 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2014-02-24 18:45:59 -0800 |
| commit | 80b4a4a1f54dccb814b5486423bf6492b3ae58a7 (patch) | |
| tree | f17c7a9b433e443b2f30251dd15b1bf50d4f803c /indra/newview/llconversationview.cpp | |
| parent | de8fea13627cc5978b8a6135802a52864a11c39a (diff) | |
| parent | ef591d280eb3c5bae7da20540ad4cbb30858d0aa (diff) | |
merge with release
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 82d3fe74c0..7c223d996b 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(); |