diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-03-19 12:53:05 +0000 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-03-19 12:53:05 +0000 |
| commit | 62be7c38965deb79cbd984cfd4546be040f9c465 (patch) | |
| tree | 492a84da19dc4ba05d41fdc083ad5f579f39b2ee /indra/newview/lloutputmonitorctrl.cpp | |
| parent | 9a6dcc011c54f65e5da3c3b92074386946d8f291 (diff) | |
| parent | 328329fceab6b18dd7dda6f7ce9a3d4788fd7c54 (diff) | |
Merged master into sl-11445_fmodstudio
Diffstat (limited to 'indra/newview/lloutputmonitorctrl.cpp')
| -rw-r--r-- | indra/newview/lloutputmonitorctrl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lloutputmonitorctrl.cpp b/indra/newview/lloutputmonitorctrl.cpp index 7f6c065bb9..e9fe493d7e 100644 --- a/indra/newview/lloutputmonitorctrl.cpp +++ b/indra/newview/lloutputmonitorctrl.cpp @@ -245,11 +245,11 @@ void LLOutputMonitorCtrl::draw() // virtual BOOL LLOutputMonitorCtrl::handleMouseUp(S32 x, S32 y, MASK mask) { - if (mSpeakerId != gAgentID && !mShowParticipantsSpeaking) + if (mSpeakerId != gAgentID) { LLFloaterReg::showInstance("floater_voice_volume", LLSD().with("avatar_id", mSpeakerId)); } - else if(mShowParticipantsSpeaking) + else if (mShowParticipantsSpeaking) { LLFloaterReg::showInstance("chat_voice", LLSD()); } |