diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-02 09:51:12 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-02 09:51:12 +0100 |
| commit | 9c715190ef9497212834452dbfd3c28856e7b044 (patch) | |
| tree | b9e479e36ce72ce80bc026749ae5f8328e520004 /indra/llui/llmultifloater.cpp | |
| parent | b1ae22c3eb71767219ebb96ec80011e10bbfabbe (diff) | |
| parent | 18d9efff12ef8b59c648a801fe2c5c7e0bc8fde4 (diff) | |
merge from viewer-trunk
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 |