diff options
| author | Armin Weatherwax | 2010-06-14 12:04:49 +0200 |
|---|---|---|
| committer | Armin Weatherwax | 2010-09-23 15:38:25 +0200 |
| commit | 35df5441d3e2789663532c948731aff3a1e04728 (patch) | |
| tree | ac7674289784a5f96106ea507637055a8dada78a /linden/indra/newview/llviewerkeyboard.cpp | |
| parent | Changed version to Experimental 2010.09.18 (diff) | |
| download | meta-impy-35df5441d3e2789663532c948731aff3a1e04728.zip meta-impy-35df5441d3e2789663532c948731aff3a1e04728.tar.gz meta-impy-35df5441d3e2789663532c948731aff3a1e04728.tar.bz2 meta-impy-35df5441d3e2789663532c948731aff3a1e04728.tar.xz | |
llmediaplugins first step
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llviewerkeyboard.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llviewerkeyboard.cpp b/linden/indra/newview/llviewerkeyboard.cpp index 15c8148..6dd7fb5 100644 --- a/linden/indra/newview/llviewerkeyboard.cpp +++ b/linden/indra/newview/llviewerkeyboard.cpp | |||
| @@ -506,7 +506,7 @@ void start_chat( EKeystate s ) | |||
| 506 | void start_gesture( EKeystate s ) | 506 | void start_gesture( EKeystate s ) |
| 507 | { | 507 | { |
| 508 | if (KEYSTATE_UP == s && | 508 | if (KEYSTATE_UP == s && |
| 509 | !(gFocusMgr.getKeyboardFocus() && gFocusMgr.getKeyboardFocus()->acceptsTextInput())) | 509 | !(gFocusMgr.getKeyboardFocus() && dynamic_cast<LLUICtrl*>(gFocusMgr.getKeyboardFocus())->acceptsTextInput())) |
| 510 | { | 510 | { |
| 511 | if (gChatBar->getCurrentChat().empty()) | 511 | if (gChatBar->getCurrentChat().empty()) |
| 512 | { | 512 | { |