summaryrefslogtreecommitdiff
path: root/indra/newview/llpreviewscript.cpp
diff options
context:
space:
mode:
authorGeenz <geenz@geenzo.com>2013-05-13 22:22:51 -0400
committerGeenz <geenz@geenzo.com>2013-05-13 22:22:51 -0400
commit3779e51bfc2010877960d11b463c7316514bf991 (patch)
treeab528a6e7f78f136f9d0f0f7e939264897a44ae1 /indra/newview/llpreviewscript.cpp
parentb27899ee0e035ebd4072a5e6162678f2afe81053 (diff)
parent4dd245055f3417d8f8fb611a198ed5671dbce292 (diff)
Merged with https://bitbucket.org/lindenlab/viewer-beta
Diffstat (limited to 'indra/newview/llpreviewscript.cpp')
-rwxr-xr-x[-rw-r--r--]indra/newview/llpreviewscript.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index 9c25e69db0..968a912ea2 100644..100755
--- 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;