diff options
| author | simon <none@none> | 2013-03-25 11:12:52 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-03-25 11:12:52 -0700 |
| commit | 98a82c50d539451e1931826ca75fbc01d611806d (patch) | |
| tree | 3c3dcac20286246f0724c11f126233702f0bdaaf /indra/newview/llpreviewscript.cpp | |
| parent | 94ae64d6fd30e4dbc3280cd277f772c038ccd9fe (diff) | |
| parent | 515f0e5a559ff3f0cb7d02e1d40b0f71425800ea (diff) | |
Pull in downstream CHUI code from viewer-development
Diffstat (limited to 'indra/newview/llpreviewscript.cpp')
| -rw-r--r-- | indra/newview/llpreviewscript.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp index 9c25e69db0..968a912ea2 100644 --- a/indra/newview/llpreviewscript.cpp +++ b/indra/newview/llpreviewscript.cpp @@ -305,7 +305,11 @@ BOOL LLFloaterScriptSearch::handleKeyHere(KEY key, MASK mask) { if (mEditorCore) { - return mEditorCore->handleKeyHere(key, mask); + BOOL handled = mEditorCore->handleKeyHere(key, mask); + if (!handled) + { + LLFloater::handleKeyHere(key, mask); + } } return FALSE; |