livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CHUI-831 ADD FIX Minimized conversation floater is not opened with Open Conversation Window preference if conversation receiving message is selected

master
AlexanderP ProductEngine 2013-03-15 17:39:09 +02:00
parent bd8b0de897
commit 780fe4e37f
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/llimview.cpp
View File

@ -287,9 +287,22 @@ void on_new_message(const LLSD& msg)
//Surface conversations floater
LLFloaterReg::showInstance("im_container");
im_box->collapseMessagesPane(false);
if (session_floater && session_floater->isMinimized())
if (session_floater)
{
LLFloater::onClickMinimize(session_floater);
if (session_floater->getHost())
{
if (NULL != im_box && im_box->isMinimized())
{
LLFloater::onClickMinimize(im_box);
}
}
else
{
if (session_floater->isMinimized())
{
LLFloater::onClickMinimize(session_floater);
}
}
}
}