diff options
| author | skolb <none@none> | 2009-12-02 17:10:21 -0800 |
|---|---|---|
| committer | skolb <none@none> | 2009-12-02 17:10:21 -0800 |
| commit | 4e0706f641cd99873def5a3e7b8e808bc219bfcc (patch) | |
| tree | 513620fb6f3f1b366efb18bffd220e0eaf6415cf /indra/newview/llviewerkeyboard.cpp | |
| parent | 050b8ba205f4f59c9b2f471ae494141d9e9f06d6 (diff) | |
Cleaned up the conditional code a bit in llviewerkeyboard.cpp, start_gesture
Diffstat (limited to 'indra/newview/llviewerkeyboard.cpp')
| -rw-r--r-- | indra/newview/llviewerkeyboard.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/indra/newview/llviewerkeyboard.cpp b/indra/newview/llviewerkeyboard.cpp index 623d128f87..f757155b94 100644 --- a/indra/newview/llviewerkeyboard.cpp +++ b/indra/newview/llviewerkeyboard.cpp @@ -538,13 +538,9 @@ void start_chat( EKeystate s ) void start_gesture( EKeystate s ) { - LLUICtrl* focus_ctrlp = NULL; - if(gFocusMgr.getKeyboardFocus()) - { - focus_ctrlp = dynamic_cast<LLUICtrl*>(gFocusMgr.getKeyboardFocus()); - } + LLUICtrl* focus_ctrlp = dynamic_cast<LLUICtrl*>(gFocusMgr.getKeyboardFocus()); if (KEYSTATE_UP == s && - !(gFocusMgr.getKeyboardFocus() && focus_ctrlp && focus_ctrlp->acceptsTextInput())) + ! (focus_ctrlp && focus_ctrlp->acceptsTextInput())) { if (LLNearbyChatBar::getInstance()->getCurrentChat().empty()) { |