diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-03-06 18:45:40 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-03-06 18:45:40 -0800 |
| commit | 179195241f5579ceeea682d7faf23dc2376338ec (patch) | |
| tree | aef237271227a9faccc1414173c7efd6d4c5657a /indra/newview/llfloaterimnearbychat.cpp | |
| parent | 4458986cf22a749d3387085a70ea07930519b8ab (diff) | |
| parent | 236eefd9c8afbdd1f9e8b32cd8d356a6c0b6b2ac (diff) | |
Pull merge from lindenlab/viewer-chui
Diffstat (limited to 'indra/newview/llfloaterimnearbychat.cpp')
| -rw-r--r-- | indra/newview/llfloaterimnearbychat.cpp | 7 |
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()) { |