diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-21 13:39:30 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-21 13:39:30 +0200 |
| commit | 1c3d7eec895a7038d9aa5ffb1e9571a172f27e72 (patch) | |
| tree | f8dfabde85f9b9807d5068bd9113470c5b265de2 /indra/newview | |
| parent | 77c97725516564f5595b2b71df54c1e32e08a7fc (diff) | |
| parent | 2b873b073c146d820d51b8f59db9ef1ff41b2648 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/lltransientfloatermgr.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/lltransientfloatermgr.cpp b/indra/newview/lltransientfloatermgr.cpp index 7befb87248..347399f239 100644 --- a/indra/newview/lltransientfloatermgr.cpp +++ b/indra/newview/lltransientfloatermgr.cpp @@ -37,6 +37,7 @@ #include "llrootview.h" #include "llviewerwindow.h" #include "lldockablefloater.h" +#include "llmenugl.h" LLTransientFloaterMgr::LLTransientFloaterMgr() @@ -87,6 +88,13 @@ void LLTransientFloaterMgr::leftMouseClickCallback(S32 x, S32 y, for (controls_set_t::iterator it = mControlsSet.begin(); it != mControlsSet.end(); it++) { + // don't hide transient floater if any context menu opened + if (LLMenuGL::sMenuContainer->getVisibleMenu() != NULL) + { + hide = false; + break; + } + LLView* control_view = *it; if (!control_view->getVisible()) { |