diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2010-04-05 15:12:12 -0700 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2010-04-05 15:12:12 -0700 |
commit | a0a7b7ed16a9161b8060e8f32e5594356e5c7329 (patch) | |
tree | 06809cac6cde316219cbcbf58a7381d907a9d5e6 /indra/llui/llmultifloater.cpp | |
parent | 6b3ca581e037d52e507a69d82fd6d900bd4641b7 (diff) | |
parent | 9bfc1c3b1060f15990bba218795a1ef6009d1535 (diff) |
Merge
Diffstat (limited to 'indra/llui/llmultifloater.cpp')
-rw-r--r-- | indra/llui/llmultifloater.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llmultifloater.cpp b/indra/llui/llmultifloater.cpp index 4af9108329..3aea648562 100644 --- a/indra/llui/llmultifloater.cpp +++ b/indra/llui/llmultifloater.cpp @@ -345,7 +345,7 @@ void LLMultiFloater::setVisible(BOOL visible) BOOL LLMultiFloater::handleKeyHere(KEY key, MASK mask) { - if (key == 'W' && mask == MASK_CONTROL) + if (key == 'W' && mask == (MASK_CONTROL|MASK_SHIFT)) { LLFloater* floater = getActiveFloater(); // is user closeable and is system closeable |