diff options
| author | Cho <cho@lindenlab.com> | 2013-03-14 01:29:58 +0100 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2013-03-14 01:29:58 +0100 |
| commit | b6d973d31380e7d35f7ed014d682dfc5f2465afe (patch) | |
| tree | 2a67c0e80831528f2cc3141a580a3a5545cc1d85 /indra/newview/llimview.cpp | |
| parent | 8b388922434e431c49b9e7f2c9d1e8d90d15ed21 (diff) | |
| parent | 8904f32ba48b49ec216a3ca3b1508d5f3f633e78 (diff) | |
merge
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 8f3f5145a9..37f5888e8c 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -285,6 +285,11 @@ void on_new_message(const LLSD& msg) { //Surface conversations floater LLFloaterReg::showInstance("im_container"); + + if (session_floater && session_floater->isMinimized()) + { + LLFloater::onClickMinimize(session_floater); + } } //If in DND mode, allow notification to be stored so upon DND exit |