diff options
| author | Richard Linden <none@none> | 2012-04-26 14:39:52 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-04-26 14:39:52 -0700 |
| commit | a0bb55adc6ff26595f20bed12cb6f1565011e246 (patch) | |
| tree | cbd25e29777ad9921b2fee2bd0b4d349caa4da61 /indra/newview/llpreviewscript.cpp | |
| parent | d6569db3520f7e0ce2d93febb6f4e26b48c08a3d (diff) | |
| parent | db316f830df45e1b0229ebcbdb5feedc5eb23913 (diff) | |
merge with viewer-release
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 88727bf59b..29eb5ce69e 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; |