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

CHUI-892 : Fixed. restoreFloater() called when floater docked

meow-7.2.2
Merov Linden 2013-03-25 23:01:36 -07:00
parent 0af5b073e0
commit 5f89fe0b61
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llfloaterimcontainer.cpp
View File

@ -1337,7 +1337,10 @@ void LLFloaterIMContainer::showConversation(const LLUUID& session_id)
selectConversationPair(session_id, true);
LLFloaterIMSessionTab* session_floater = LLFloaterIMSessionTab::findConversation(session_id);
session_floater->restoreFloater();
if (session_floater)
{
session_floater->restoreFloater();
}
}
void LLFloaterIMContainer::clearAllFlashStates()

2
indra/newview/llfloaterimsessiontab.cpp
View File

@ -874,7 +874,7 @@ void LLFloaterIMSessionTab::reshapeFloater(bool collapse)
void LLFloaterIMSessionTab::restoreFloater()
{
if(!isMessagePaneExpanded())
if(checkIfTornOff() && !isMessagePaneExpanded())
{
if(isMinimized())
{