diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-01-11 14:18:36 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-01-11 14:18:36 -0800 |
| commit | 9f8959d480d1069f554c576a4cc9a494559ef1e4 (patch) | |
| tree | 7ae4f550c1039cdb15d0087a0511310dddf8b5a5 /indra/newview/llpreviewscript.cpp | |
| parent | d16757545c91d4f7dac3c52a311ad0f0239052e1 (diff) | |
| parent | 573ab07a40acc78e28ae390331d862d3f858bb07 (diff) | |
Pull merge from viewer-chui
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; |