diff options
Diffstat (limited to 'indra/llui/llmodaldialog.cpp')
| -rw-r--r-- | indra/llui/llmodaldialog.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/indra/llui/llmodaldialog.cpp b/indra/llui/llmodaldialog.cpp index 225ff607ad..c5c31f7252 100644 --- a/indra/llui/llmodaldialog.cpp +++ b/indra/llui/llmodaldialog.cpp @@ -28,7 +28,6 @@ #include "llmodaldialog.h" -#include "llemojihelper.h" #include "llfocusmgr.h" #include "v4color.h" #include "v2math.h" @@ -36,7 +35,6 @@ #include "llwindow.h" #include "llkeyboard.h" #include "llmenugl.h" - // static std::list<LLModalDialog*> LLModalDialog::sModalStack; @@ -100,7 +98,7 @@ void LLModalDialog::onOpen(const LLSD& key) { if (mModal) { - // If Modal, hide the active modal dialog + // If Modal, Hide the active modal dialog if (!sModalStack.empty()) { LLModalDialog* front = sModalStack.front(); @@ -157,12 +155,6 @@ void LLModalDialog::setVisible( bool visible ) { if( visible ) { - // Hide all menus currently shown - LLMenuGL::sMenuContainer->hideMenus(); - - // Hide EmojiPicker if it is shown - LLEmojiHelper::instance().hideHelper(nullptr, true); - // This is a modal dialog. It sucks up all mouse and keyboard operations. gFocusMgr.setMouseCapture( this ); @@ -309,6 +301,7 @@ void LLModalDialog::centerOnScreen() centerWithin(LLRect(0, 0, ll_round(window_size.mV[VX]), ll_round(window_size.mV[VY]))); } + // static void LLModalDialog::onAppFocusLost() { @@ -340,7 +333,6 @@ void LLModalDialog::onAppFocusGained() } } -// static void LLModalDialog::shutdownModals() { // This method is only for use during app shutdown. ~LLModalDialog() |