diff options
| author | mberezhnoy <mberezhnoy@productengine.com> | 2013-03-14 19:12:38 +0200 |
|---|---|---|
| committer | mberezhnoy <mberezhnoy@productengine.com> | 2013-03-14 19:12:38 +0200 |
| commit | 5b4746701bcacd0562fc7876f4b6db652ccfcb3b (patch) | |
| tree | 85ee66681c62b2efe2b59287590a57a8fa94dd9b /indra/newview/llimview.cpp | |
| parent | 3ee18d8b29caa612ee7656aa1ac69e3c1edce4cc (diff) | |
| parent | b6d973d31380e7d35f7ed014d682dfc5f2465afe (diff) | |
merging
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 699e36db4f..cd47a0c171 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -286,6 +286,10 @@ void on_new_message(const LLSD& msg) //Surface conversations floater LLFloaterReg::showInstance("im_container"); im_box->collapseMessagesPane(false); + if (session_floater && session_floater->isMinimized()) + { + LLFloater::onClickMinimize(session_floater); + } } //If in DND mode, allow notification to be stored so upon DND exit |