diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-11-12 00:39:07 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-11-12 00:39:07 +0200 |
| commit | 84f3b2865fe3ec2a3dfb0a96ed0389381cebeed5 (patch) | |
| tree | 1490249690bb3c7c0509e8ad73e2b7f7748d9dba /indra/llui/llfocusmgr.cpp | |
| parent | 6ec37fac60c0288e576b72b91b16d74b37dbc32d (diff) | |
| parent | 78bdf57ad6610b34389226bf941ba736ca0c2225 (diff) | |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/llui/llfocusmgr.cpp')
| -rw-r--r-- | indra/llui/llfocusmgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llfocusmgr.cpp b/indra/llui/llfocusmgr.cpp index 1b213c3418..7b0a6cbdae 100644 --- a/indra/llui/llfocusmgr.cpp +++ b/indra/llui/llfocusmgr.cpp @@ -183,7 +183,7 @@ void LLFocusMgr::releaseFocusIfNeeded( LLView* view ) } } - LLUI::removePopup(view); + LLUI::getInstance()->removePopup(view); } void LLFocusMgr::setKeyboardFocus(LLFocusableElement* new_focus, BOOL lock, BOOL keystrokes_only) @@ -481,7 +481,7 @@ void LLFocusMgr::setAppHasFocus(BOOL focus) // release focus from "top ctrl"s, which generally hides them if (!focus) { - LLUI::clearPopups(); + LLUI::getInstance()->clearPopups(); } mAppHasFocus = focus; } |