summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-04-20 13:52:49 -0700
committerRichard Linden <none@none>2012-04-20 13:52:49 -0700
commit23f7db3ceeadd9729f437ee12996e86d3a0bcff0 (patch)
tree3360fdfcf4007e95f889874d33207e5bea86c483 /indra/newview
parent05600db8968d05e816cd637e99d821961802cbc0 (diff)
allow nested modifier tags (e.g. Lazy, Atomic) in param block entries
Diffstat (limited to 'indra/newview')
-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 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;