summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authormaxim_productengine <mnikolenko@productengine.com>2012-08-09 13:01:13 +0300
committermaxim_productengine <mnikolenko@productengine.com>2012-08-09 13:01:13 +0300
commitb38d8b1e15d9d2c52e7f2fa7d654e06039eb7b2f (patch)
treed4375f6048504fdcf4974769b8ff5b55d159ab52 /indra/newview
parentff2bb96a55e8869843174be7324b0a59578a4f0d (diff)
MAINT-881 FIXED Whisper in nearby chat after pressing shift-enter
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llnearbychatbar.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llnearbychatbar.cpp b/indra/newview/llnearbychatbar.cpp
index f8f0f7d243..7f8fea88d2 100644
--- a/indra/newview/llnearbychatbar.cpp
+++ b/indra/newview/llnearbychatbar.cpp
@@ -203,7 +203,12 @@ BOOL LLNearbyChatBar::handleKeyHere( KEY key, MASK mask )
sendChat(CHAT_TYPE_SHOUT);
handled = TRUE;
}
-
+ else if (KEY_RETURN == key && mask == MASK_SHIFT)
+ {
+ // whisper
+ sendChat(CHAT_TYPE_WHISPER);
+ handled = TRUE;
+ }
return handled;
}