diff options
| author | Jacek Antonelli | 2008-08-15 23:44:56 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-08-15 23:44:56 -0500 |
| commit | c07901e29ed545bbb02e3bddf148fe1104b94e9f (patch) | |
| tree | f1ada64ce834acd7d92a425efb96c4b86bcf16b1 /linden/indra/llui/llpanel.cpp | |
| parent | Second Life viewer sources 1.15.0.2 (diff) | |
| download | meta-impy-c07901e29ed545bbb02e3bddf148fe1104b94e9f.zip meta-impy-c07901e29ed545bbb02e3bddf148fe1104b94e9f.tar.gz meta-impy-c07901e29ed545bbb02e3bddf148fe1104b94e9f.tar.bz2 meta-impy-c07901e29ed545bbb02e3bddf148fe1104b94e9f.tar.xz | |
Second Life viewer sources 1.15.1.3
Diffstat (limited to 'linden/indra/llui/llpanel.cpp')
| -rw-r--r-- | linden/indra/llui/llpanel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/llui/llpanel.cpp b/linden/indra/llui/llpanel.cpp index 9e444c1..f0b5b25 100644 --- a/linden/indra/llui/llpanel.cpp +++ b/linden/indra/llui/llpanel.cpp | |||
| @@ -362,7 +362,7 @@ BOOL LLPanel::handleKeyHere( KEY key, MASK mask, BOOL called_from_parent ) | |||
| 362 | // If we have a default button, click it when | 362 | // If we have a default button, click it when |
| 363 | // return is pressed, unless current focus is a return-capturing button | 363 | // return is pressed, unless current focus is a return-capturing button |
| 364 | // in which case *that* button will handle the return key | 364 | // in which case *that* button will handle the return key |
| 365 | if (!(cur_focus->getWidgetType() == WIDGET_TYPE_BUTTON && static_cast<LLButton *>(cur_focus)->getCommitOnReturn())) | 365 | if (cur_focus && !(cur_focus->getWidgetType() == WIDGET_TYPE_BUTTON && static_cast<LLButton *>(cur_focus)->getCommitOnReturn())) |
| 366 | { | 366 | { |
| 367 | // RETURN key means hit default button in this case | 367 | // RETURN key means hit default button in this case |
| 368 | if (key == KEY_RETURN && mask == MASK_NONE | 368 | if (key == KEY_RETURN && mask == MASK_NONE |