summaryrefslogtreecommitdiff
path: root/indra/llui/llmultifloater.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-06-22 15:53:28 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-06-22 15:53:28 -0400
commitba4c4bcbd19750c8b5a8ff88c9e410dbfef16fbd (patch)
treea274fae3ed2956dcb95ed16927be207cb12c593a /indra/llui/llmultifloater.cpp
parentd912f24cb0cea21ce05a127824abb6a2c55231de (diff)
parent90547ff411db177bf6424ca553449a81a808fc0f (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 f3a48835b1..aa5f577897 100644
--- a/indra/llui/llmultifloater.cpp
+++ b/indra/llui/llmultifloater.cpp
@@ -349,7 +349,7 @@ void LLMultiFloater::setVisible(BOOL visible)
BOOL LLMultiFloater::handleKeyHere(KEY key, MASK mask)
{
- if (key == 'W' && mask == (MASK_CONTROL|MASK_SHIFT))
+ if (key == 'W' && mask == MASK_CONTROL)
{
LLFloater* floater = getActiveFloater();
// is user closeable and is system closeable