diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-06-19 13:59:52 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-06-19 13:59:52 -0400 |
| commit | e23228fef2834587af490d0345f29212445666d8 (patch) | |
| tree | dfa761027aca1227ec1817707f8141b833c061df /indra/newview/llpreviewscript.cpp | |
| parent | c880c961bb2a0838bc529efc07cfeb12f5636d88 (diff) | |
| parent | 8a330ee2eb1008951f5e5159057fa5736dd805b4 (diff) | |
merge 3.5.0-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 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; |