From 773a296383ebad29ad3f7a618405535e306d71b1 Mon Sep 17 00:00:00 2001 From: mberezhnoy Date: Wed, 29 May 2013 19:04:02 +0300 Subject: CHUI-915 ([CHUIBUG]Control+W hides Conversations floater instead of closing active tab) --- indra/newview/llfloaterimcontainer.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'indra') diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp index 4bfb19ce36..3783ae60e7 100755 --- a/indra/newview/llfloaterimcontainer.cpp +++ b/indra/newview/llfloaterimcontainer.cpp @@ -2132,17 +2132,19 @@ void LLFloaterIMContainer::closeFloater(bool app_quitting/* = false*/) { onClickCloseBtn(); } - - // Otherwise, close current conversation - LLFloaterIMSessionTab* active_conversation = LLFloaterIMSessionTab::getConversation(session_id); - if (active_conversation) + else { - active_conversation->closeFloater(); - if(app_quitting) + // Otherwise, close current conversation + LLFloaterIMSessionTab* active_conversation = LLFloaterIMSessionTab::getConversation(session_id); + if (active_conversation) { - LLFloater::closeFloater(app_quitting); - } + active_conversation->closeFloater(); + if(app_quitting) + { + LLFloater::closeFloater(app_quitting); + } + } } } -- cgit v1.2.3