summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2013-03-05 15:28:41 +0200
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2013-03-05 15:28:41 +0200
commit67741ae9786a88bb00f3419ad6a8ac8533481acb (patch)
tree342201fedd5aa06d4f1013ca8a5330b3fc9a9b83 /indra
parentce7db31b7f113967d1fb8033bb41261700fca109 (diff)
CHUI-815 FIXED Handle SHIFT+ENTER to whisper in Nearby chat
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llfloaterimnearbychat.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llfloaterimnearbychat.cpp b/indra/newview/llfloaterimnearbychat.cpp
index 02f54e76db..dfaf4bbdd6 100644
--- a/indra/newview/llfloaterimnearbychat.cpp
+++ b/indra/newview/llfloaterimnearbychat.cpp
@@ -353,6 +353,13 @@ BOOL LLFloaterIMNearbyChat::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;
+ }
+
if((mask == MASK_ALT) && isTornOff())
{