diff options
| author | bea@american.lindenlab.com <bea@american.lindenlab.com> | 2009-12-03 08:49:08 -0800 |
|---|---|---|
| committer | bea@american.lindenlab.com <bea@american.lindenlab.com> | 2009-12-03 08:49:08 -0800 |
| commit | 9b17e6710b713fa12f6db7d6f51d97e4052a0835 (patch) | |
| tree | 81ad36d56262c60525176394f162ba49da978e7a /indra/newview/llviewerkeyboard.cpp | |
| parent | db4ea92fa8fb3a0c20194824ecd59f9ef0d8b5f2 (diff) | |
| parent | 469f17f9c21062d545a78e08dedcdc2bc978c7b6 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerkeyboard.cpp')
| -rw-r--r-- | indra/newview/llviewerkeyboard.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerkeyboard.cpp b/indra/newview/llviewerkeyboard.cpp index 8fd646ee93..f757155b94 100644 --- a/indra/newview/llviewerkeyboard.cpp +++ b/indra/newview/llviewerkeyboard.cpp @@ -538,8 +538,9 @@ void start_chat( EKeystate s ) void start_gesture( EKeystate s ) { + LLUICtrl* focus_ctrlp = dynamic_cast<LLUICtrl*>(gFocusMgr.getKeyboardFocus()); if (KEYSTATE_UP == s && - !(gFocusMgr.getKeyboardFocus() && dynamic_cast<LLUICtrl*>(gFocusMgr.getKeyboardFocus())->acceptsTextInput())) + ! (focus_ctrlp && focus_ctrlp->acceptsTextInput())) { if (LLNearbyChatBar::getInstance()->getCurrentChat().empty()) { |