diff options
| author | skolb <none@none> | 2009-12-02 16:55:45 -0800 |
|---|---|---|
| committer | skolb <none@none> | 2009-12-02 16:55:45 -0800 |
| commit | 050b8ba205f4f59c9b2f471ae494141d9e9f06d6 (patch) | |
| tree | be682b3c4c0dd6cd3b9d2068170b85d869afdb3b | |
| parent | b5fa4a6d0d6fe6c28673e547297dd160ab56bb06 (diff) | |
DEV-42150 crash when using media on a HUD
| -rw-r--r-- | indra/newview/llviewerkeyboard.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llviewerkeyboard.cpp b/indra/newview/llviewerkeyboard.cpp index 8fd646ee93..623d128f87 100644 --- a/indra/newview/llviewerkeyboard.cpp +++ b/indra/newview/llviewerkeyboard.cpp @@ -538,8 +538,13 @@ void start_chat( EKeystate s ) void start_gesture( EKeystate s ) { + LLUICtrl* focus_ctrlp = NULL; + if(gFocusMgr.getKeyboardFocus()) + { + focus_ctrlp = dynamic_cast<LLUICtrl*>(gFocusMgr.getKeyboardFocus()); + } if (KEYSTATE_UP == s && - !(gFocusMgr.getKeyboardFocus() && dynamic_cast<LLUICtrl*>(gFocusMgr.getKeyboardFocus())->acceptsTextInput())) + !(gFocusMgr.getKeyboardFocus() && focus_ctrlp && focus_ctrlp->acceptsTextInput())) { if (LLNearbyChatBar::getInstance()->getCurrentChat().empty()) { |