summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexanderP ProductEngine <apaschenko@productengine.com>2013-03-12 17:20:15 +0200
committerAlexanderP ProductEngine <apaschenko@productengine.com>2013-03-12 17:20:15 +0200
commitaa8809ff3b2f29ad2140328be955e338725d613b (patch)
tree30dce860fa81dd162b0f8345e908ac8058623521
parentc594e848656f2bc1d29c48b7ceae782b5d542ad2 (diff)
CHUI-831 Minimized conversation floater is not opened with Open Conversation Window preference if conversation receiving message is selected : force unminimized of the session's floater
-rw-r--r--indra/newview/llimview.cpp5
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