diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-21 15:20:41 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-21 15:20:41 -0500 |
| commit | d215cd5c244a5448668cb2173b1d95d0d6adf3ae (patch) | |
| tree | 1ca61d7f58f2cfd063167c235431cf3836416db4 /indra/newview/lltransientfloatermgr.cpp | |
| parent | 37b04c150792bb3e53a5ba02c6631aa1d0f8686f (diff) | |
| parent | c72de2edf0a2f7590fd43d86c59e83afcf7e8bcf (diff) | |
automated merge PE->viewer2.0
Diffstat (limited to 'indra/newview/lltransientfloatermgr.cpp')
| -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()) { |