diff options
author | andreykproductengine <akleshchev@productengine.com> | 2016-07-08 15:07:52 +0300 |
---|---|---|
committer | andreykproductengine <akleshchev@productengine.com> | 2016-07-08 15:07:52 +0300 |
commit | 1c7548d3bfaa6f2351d8102e53b2dd90a5d864e7 (patch) | |
tree | b35a769ca61a9542a280789ea75a91ca0c19a749 /indra/newview | |
parent | 8d542a46c7b1c5eb1817076348c0793fa6d3f617 (diff) |
MAINT-6448 PERMISSION_DEBIT notification should default to Deny
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/lltoast.cpp | 15 | ||||
-rw-r--r-- | indra/newview/lltoast.h | 2 |
2 files changed, 17 insertions, 0 deletions
diff --git a/indra/newview/lltoast.cpp b/indra/newview/lltoast.cpp index 7020ac0c65..edde7c8076 100644 --- a/indra/newview/lltoast.cpp +++ b/indra/newview/lltoast.cpp @@ -202,6 +202,21 @@ void LLToast::hide() } } +/*virtual*/ +void LLToast::setFocus(BOOL b) +{ + if (b && !hasFocus() && mPanel) + { + LLModalDialog::setFocus(TRUE); + // mostly for buttons + mPanel->setFocus(TRUE); + } + else + { + LLModalDialog::setFocus(b); + } +} + void LLToast::onFocusLost() { if(mWrapperPanel && !isBackgroundVisible()) diff --git a/indra/newview/lltoast.h b/indra/newview/lltoast.h index f02d7c2a1a..cd92189012 100644 --- a/indra/newview/lltoast.h +++ b/indra/newview/lltoast.h @@ -150,6 +150,8 @@ public: // virtual void hide(); + /*virtual*/ void setFocus(BOOL b); + /*virtual*/ void onFocusLost(); /*virtual*/ void onFocusReceived(); |