summaryrefslogtreecommitdiff
path: root/indra/llui/llmultifloater.cpp
diff options
context:
space:
mode:
authorMatthew Breindel (Falcon) <falcon@lindenlab.com>2010-04-13 17:33:58 -0700
committerMatthew Breindel (Falcon) <falcon@lindenlab.com>2010-04-13 17:33:58 -0700
commitf480e1e8fc8d5e7f0c10eec26e03430e5aed8eaa (patch)
treea2331f2444183d4399323eec28343a5b8013ffb6 /indra/llui/llmultifloater.cpp
parente0bfefbd63449c0fe5ef7964677948f012d51506 (diff)
parent0660cf0c987385dc2923bff389c7fa1bc0feec81 (diff)
Merge
Diffstat (limited to 'indra/llui/llmultifloater.cpp')
-rw-r--r--indra/llui/llmultifloater.cpp2
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