diff options
| author | Paul ProductEngine <pguslisty@productengine.com> | 2012-09-28 15:02:31 +0300 |
|---|---|---|
| committer | Paul ProductEngine <pguslisty@productengine.com> | 2012-09-28 15:02:31 +0300 |
| commit | 3e3735c16b47402d8fc2da8afa6086638fb5b948 (patch) | |
| tree | 2c64a4be5ad82d4937d7a000d6fa912e1bfed066 /indra/newview/lloutputmonitorctrl.cpp | |
| parent | 78e6b910a5012352ab265e52a78b0d340ac7ce27 (diff) | |
CHUI-345 ADDITIONAL FIX (LLConversationViewSession: enable speaking indicator)
- Clicking on the conversation speaking icon brings up the volume floater for voice conversations
Diffstat (limited to 'indra/newview/lloutputmonitorctrl.cpp')
| -rw-r--r-- | indra/newview/lloutputmonitorctrl.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/lloutputmonitorctrl.cpp b/indra/newview/lloutputmonitorctrl.cpp index c3cbca68c7..4a9a50d96a 100644 --- a/indra/newview/lloutputmonitorctrl.cpp +++ b/indra/newview/lloutputmonitorctrl.cpp @@ -264,10 +264,14 @@ void LLOutputMonitorCtrl::draw() // virtual BOOL LLOutputMonitorCtrl::handleMouseUp(S32 x, S32 y, MASK mask) { - if (mSpeakerId != gAgentID) + if (mSpeakerId != gAgentID && !mShowParticipantsSpeaking) { LLFloaterReg::showInstance("floater_voice_volume", LLSD().with("avatar_id", mSpeakerId)); } + else if(mShowParticipantsSpeaking) + { + LLFloaterReg::showInstance("chat_voice", LLSD()); + } return TRUE; } |