diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-04-02 11:18:29 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-04-02 11:18:29 -0500 |
| commit | 3e8da4e8d5ec7a477db00de99ec4c75985c17094 (patch) | |
| tree | a76d4b02258d9b2d3d12e7640a7a50830c007241 /indra/newview/llpreviewscript.cpp | |
| parent | 8f9ddc67fdcdf53313ae4217ffa551a5a157c765 (diff) | |
| parent | 5f5732365b3c5a3b85fdc0be6fbbbbc0c2de01f2 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/davep-materials
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; |