diff options
author | Jacek Antonelli | 2008-08-15 23:45:42 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:42 -0500 |
commit | ce28e056c20bf2723f565bbf464b87781ec248a2 (patch) | |
tree | ef7b0501c4de4b631a916305cbc2a5fdc125e52d /linden/indra/llui/llfocusmgr.cpp | |
parent | Second Life viewer sources 1.19.1.4b (diff) | |
download | meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.zip meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.gz meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.bz2 meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.xz |
Second Life viewer sources 1.20.2
Diffstat (limited to 'linden/indra/llui/llfocusmgr.cpp')
-rw-r--r-- | linden/indra/llui/llfocusmgr.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/linden/indra/llui/llfocusmgr.cpp b/linden/indra/llui/llfocusmgr.cpp index 0634513..e2d1f46 100644 --- a/linden/indra/llui/llfocusmgr.cpp +++ b/linden/indra/llui/llfocusmgr.cpp | |||
@@ -46,6 +46,7 @@ LLFocusMgr::LLFocusMgr() | |||
46 | mKeyboardFocus( NULL ), | 46 | mKeyboardFocus( NULL ), |
47 | mLastKeyboardFocus( NULL ), | 47 | mLastKeyboardFocus( NULL ), |
48 | mDefaultKeyboardFocus( NULL ), | 48 | mDefaultKeyboardFocus( NULL ), |
49 | mKeystrokesOnly(FALSE), | ||
49 | mTopCtrl( NULL ), | 50 | mTopCtrl( NULL ), |
50 | mFocusWeight(0.f), | 51 | mFocusWeight(0.f), |
51 | mAppHasFocus(TRUE) // Macs don't seem to notify us that we've gotten focus, so default to true | 52 | mAppHasFocus(TRUE) // Macs don't seem to notify us that we've gotten focus, so default to true |
@@ -85,7 +86,7 @@ void LLFocusMgr::releaseFocusIfNeeded( const LLView* view ) | |||
85 | } | 86 | } |
86 | 87 | ||
87 | 88 | ||
88 | void LLFocusMgr::setKeyboardFocus(LLUICtrl* new_focus, BOOL lock) | 89 | void LLFocusMgr::setKeyboardFocus(LLUICtrl* new_focus, BOOL lock, BOOL keystrokes_only) |
89 | { | 90 | { |
90 | if (mLockedView && | 91 | if (mLockedView && |
91 | (new_focus == NULL || | 92 | (new_focus == NULL || |
@@ -98,6 +99,8 @@ void LLFocusMgr::setKeyboardFocus(LLUICtrl* new_focus, BOOL lock) | |||
98 | 99 | ||
99 | //llinfos << "Keyboard focus handled by " << (new_focus ? new_focus->getName() : "nothing") << llendl; | 100 | //llinfos << "Keyboard focus handled by " << (new_focus ? new_focus->getName() : "nothing") << llendl; |
100 | 101 | ||
102 | mKeystrokesOnly = keystrokes_only; | ||
103 | |||
101 | if( new_focus != mKeyboardFocus ) | 104 | if( new_focus != mKeyboardFocus ) |
102 | { | 105 | { |
103 | mLastKeyboardFocus = mKeyboardFocus; | 106 | mLastKeyboardFocus = mKeyboardFocus; |