summaryrefslogtreecommitdiff
path: root/indra/llui/llmultifloater.cpp
diff options
context:
space:
mode:
authorIgor Borovkov <iborovkov@productengine.com>2010-04-02 17:24:44 +0300
committerIgor Borovkov <iborovkov@productengine.com>2010-04-02 17:24:44 +0300
commit16b22d4abe99f8b43628db9db8142d65f431b062 (patch)
tree079db718f06c6ed35267db5fe35b1dbd7f2de28f /indra/llui/llmultifloater.cpp
parentf4f05ad4dfc1ae47ffad0c9e2d26c4123d7f42c1 (diff)
parent7d38dd51c2a59d173bee9c04737002313f4b9dec (diff)
merge
--HG-- branch : product-engine
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