diff options
| author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-01-25 13:32:17 +0200 |
|---|---|---|
| committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-01-25 13:32:17 +0200 |
| commit | 088056c5bf4adc589c7fcc65236b90a466e59705 (patch) | |
| tree | 9f3967255a46a396adf51fd39d3859cfa385e633 /indra/newview/lltransientfloatermgr.cpp | |
| parent | 7fc90e2385c6376599818a3a7a3d815535671178 (diff) | |
| parent | 149c56ae429b0dc8ebf349027fe855066b3447f7 (diff) | |
merge
--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); |