diff options
| author | Alexander Gavriliuk <alexandrgproductengine@lindenlab.com> | 2024-01-22 06:40:41 +0100 |
|---|---|---|
| committer | Guru <alexandrgproductengine@lindenlab.com> | 2024-01-24 00:07:10 +0300 |
| commit | f6ceafee5bb26cf86d64959cabf68deefaf791a8 (patch) | |
| tree | a23ab37a1d09983e53b668f75a355fee40ac96e9 /indra/llui/lluictrl.cpp | |
| parent | ae91ae43a51c58cc496f3947921fbf886c6be86e (diff) | |
SL-20416 Avoid of taking focus by EmojiPicker
Diffstat (limited to 'indra/llui/lluictrl.cpp')
| -rw-r--r-- | indra/llui/lluictrl.cpp | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp index 21afcae7c3..7eb9ae69fb 100644 --- a/indra/llui/lluictrl.cpp +++ b/indra/llui/lluictrl.cpp @@ -768,25 +768,20 @@ void LLUICtrl::setIsChrome(BOOL is_chrome) // virtual BOOL LLUICtrl::getIsChrome() const -{ +{ + if (mIsChrome) + return TRUE; + LLView* parent_ctrl = getParent(); - while(parent_ctrl) + while (parent_ctrl) { - if(parent_ctrl->isCtrl()) - { - break; - } + if (parent_ctrl->isCtrl()) + return ((LLUICtrl*)parent_ctrl)->getIsChrome(); + parent_ctrl = parent_ctrl->getParent(); } - - if(parent_ctrl) - { - return mIsChrome || ((LLUICtrl*)parent_ctrl)->getIsChrome(); - } - else - { - return mIsChrome ; - } + + return FALSE; } |