From 6ffc21e00d07a7c90d46009571556a9caec96e62 Mon Sep 17 00:00:00 2001 From: Alexei Arabadji Date: Mon, 25 Jan 2010 12:07:23 +0200 Subject: fixed EXT-3395 "Docked IM/Chat windows shouldn't hide when voice control panel is opened", added transient controls group 'DOCKED' for temporary excluded docked floaters and dock widgets; --HG-- branch : product-engine --- indra/newview/lltransientfloatermgr.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/newview/lltransientfloatermgr.cpp') diff --git a/indra/newview/lltransientfloatermgr.cpp b/indra/newview/lltransientfloatermgr.cpp index 8f1a738453..d82403070b 100644 --- a/indra/newview/lltransientfloatermgr.cpp +++ b/indra/newview/lltransientfloatermgr.cpp @@ -46,6 +46,7 @@ LLTransientFloaterMgr::LLTransientFloaterMgr() &LLTransientFloaterMgr::leftMouseClickCallback, this, _1, _2, _3)); mGroupControls.insert(std::pair >(GLOBAL, std::set())); + mGroupControls.insert(std::pair >(DOCKED, std::set())); mGroupControls.insert(std::pair >(IM, std::set())); } @@ -132,7 +133,8 @@ void LLTransientFloaterMgr::leftMouseClickCallback(S32 x, S32 y, return; } - bool hide = isControlClicked(mGroupControls.find(GLOBAL)->second, x, y); + bool hide = isControlClicked(mGroupControls.find(DOCKED)->second, x, y) + && isControlClicked(mGroupControls.find(GLOBAL)->second, x, y); if (hide) { hideTransientFloaters(x, y); -- cgit v1.3