From d373dcc7cbed5fdea72c6b71a5594e4e85549b43 Mon Sep 17 00:00:00 2001 From: Don Kjer Date: Fri, 20 Jul 2007 20:38:05 +0000 Subject: svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release * WARNING *: maintenance r64837 is not the last rev to use in the next merge. use r65269 --- indra/newview/llimview.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'indra/newview/llimview.cpp') diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 336da9ac79..5a6cbb045d 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -536,11 +536,11 @@ void LLIMView::removeSession(const LLUUID& session_id) mFloaters.erase(floater->getHandle()); mTalkFloater->removeFloater(floater); //mTabContainer->removeTabPanel(floater); - } - - if ( session_id.notNull() && floater->getDialogType() != IM_NOTHING_SPECIAL ) - { - mSessionsDropRequested[session_id.asString()] = LLSD(); + if(session_id.notNull() + && (floater->getDialogType() != IM_NOTHING_SPECIAL)) + { + mSessionsDropRequested[session_id.asString()] = LLSD(); + } } } -- cgit v1.2.3