From 2b873b073c146d820d51b8f59db9ef1ff41b2648 Mon Sep 17 00:00:00 2001 From: Alexei Arabadji Date: Mon, 21 Dec 2009 12:46:11 +0200 Subject: =?UTF-8?q?fixed=20EXT-3395=20=E2=80=9CDocked=20IM/Chat=20windows?= =?UTF-8?q?=20shouldn't=20hide=20when=20voice=20control=20panel=20is=20ope?= =?UTF-8?q?ned=E2=80=9D,=20made=20transient=20floaters=20visible=20if=20cl?= =?UTF-8?q?icked=20any=20context=20menu;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --HG-- branch : product-engine --- indra/newview/lltransientfloatermgr.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'indra/newview') 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()) { -- cgit v1.2.3