diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-03-25 23:01:36 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-03-25 23:01:36 -0700 |
| commit | 5f89fe0b617d5df6d22b58ae7818b80c0eddcf7d (patch) | |
| tree | 458ba1249c56ee66ad26b6e56a7020efb08c2d9d /indra/newview | |
| parent | 0af5b073e0557a4918d4094841c3a045a8c71ba9 (diff) | |
CHUI-892 : Fixed. restoreFloater() called when floater docked
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloaterimcontainer.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/llfloaterimsessiontab.cpp | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp index 0cda1f79b3..7296ec3ced 100644 --- a/indra/newview/llfloaterimcontainer.cpp +++ b/indra/newview/llfloaterimcontainer.cpp @@ -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() diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp index 0333bacd58..d15c73a4a3 100644 --- a/indra/newview/llfloaterimsessiontab.cpp +++ b/indra/newview/llfloaterimsessiontab.cpp @@ -874,7 +874,7 @@ void LLFloaterIMSessionTab::reshapeFloater(bool collapse) void LLFloaterIMSessionTab::restoreFloater() { - if(!isMessagePaneExpanded()) + if(checkIfTornOff() && !isMessagePaneExpanded()) { if(isMinimized()) { |