Skip to content
Snippets Groups Projects
Commit 2b873b07 authored by Alexei Arabadji's avatar Alexei Arabadji
Browse files

fixed EXT-3395 “Docked IM/Chat windows shouldn't hide when voice control panel

is opened”,
made transient floaters visible if clicked any context menu;

--HG--
branch : product-engine
parent 05898105
No related branches found
No related tags found
No related merge requests found
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include "llrootview.h" #include "llrootview.h"
#include "llviewerwindow.h" #include "llviewerwindow.h"
#include "lldockablefloater.h" #include "lldockablefloater.h"
#include "llmenugl.h"
LLTransientFloaterMgr::LLTransientFloaterMgr() LLTransientFloaterMgr::LLTransientFloaterMgr()
...@@ -87,6 +88,13 @@ void LLTransientFloaterMgr::leftMouseClickCallback(S32 x, S32 y, ...@@ -87,6 +88,13 @@ void LLTransientFloaterMgr::leftMouseClickCallback(S32 x, S32 y,
for (controls_set_t::iterator it = mControlsSet.begin(); it for (controls_set_t::iterator it = mControlsSet.begin(); it
!= mControlsSet.end(); 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; LLView* control_view = *it;
if (!control_view->getVisible()) if (!control_view->getVisible())
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment