summaryrefslogtreecommitdiff
path: root/indra/llui/llmultifloater.cpp
diff options
context:
space:
mode:
authorRichard Nelson <none@none>2010-04-01 15:46:34 -0700
committerRichard Nelson <none@none>2010-04-01 15:46:34 -0700
commit51e1c6b78a36cb968b9b3ea3d37a14dbe2609e8a (patch)
tree8c92a1f3a47c9fe66d1fe7696f4fbd8aea1a52ea /indra/llui/llmultifloater.cpp
parentca8da832bdb1532c47208ea5e1b6ef50a40c3677 (diff)
parent6cc65f9e5f0aba9242295d955eb31c4938b093e1 (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