diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-15 15:45:02 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-15 15:45:02 -0800 |
| commit | e775e95416234f9a6abdb00a792b8ba392eeb607 (patch) | |
| tree | 7f1f74791afe6bfcd3928aa955f0bf99748a74d0 /indra/newview/llfloaterimsession.cpp | |
| parent | d3474c6eaf5f26986e7988f4ca773f67e034c49d (diff) | |
| parent | 37d7f469055d3ba4b81815fa2ac8459022e1e3cf (diff) | |
merging in latest changes
Diffstat (limited to 'indra/newview/llfloaterimsession.cpp')
| -rw-r--r-- | indra/newview/llfloaterimsession.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimsession.cpp b/indra/newview/llfloaterimsession.cpp index 0c622e07c4..e1dc5b91d0 100644 --- a/indra/newview/llfloaterimsession.cpp +++ b/indra/newview/llfloaterimsession.cpp @@ -142,7 +142,7 @@ void LLFloaterIMSession::newIMCallback(const LLSD& data) LLFloaterIMSession* floater = LLFloaterReg::findTypedInstance<LLFloaterIMSession>("impanel", session_id); // update if visible, otherwise will be updated when opened - if (floater && floater->getVisible()) + if (floater && (floater->getHost()? floater->hasFocus() : floater->getVisible())) { floater->updateMessages(); } |