diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2010-01-25 12:07:23 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2010-01-25 12:07:23 +0200 |
| commit | 6ffc21e00d07a7c90d46009571556a9caec96e62 (patch) | |
| tree | 8e17f9fb2cfc81f2779c377fe99ea1909ec93314 /indra/newview/lltransientfloatermgr.cpp | |
| parent | ab0c9c6754836cb26a520d0a9b2d7bbdd13a5f32 (diff) | |
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
Diffstat (limited to 'indra/newview/lltransientfloatermgr.cpp')
| -rw-r--r-- | indra/newview/lltransientfloatermgr.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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<ETransientGroup, std::set<LLView*> >(GLOBAL, std::set<LLView*>())); + mGroupControls.insert(std::pair<ETransientGroup, std::set<LLView*> >(DOCKED, std::set<LLView*>())); mGroupControls.insert(std::pair<ETransientGroup, std::set<LLView*> >(IM, std::set<LLView*>())); } @@ -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); |