diff options
author | Cho <cho@lindenlab.com> | 2013-01-25 22:56:35 +0000 |
---|---|---|
committer | Cho <cho@lindenlab.com> | 2013-01-25 22:56:35 +0000 |
commit | 427725c2a6d5c50468e7579a4d3b92795425723f (patch) | |
tree | 59def37a836e261e1c1a7027a450e59785f25fc3 /indra/newview/llspeakingindicatormanager.cpp | |
parent | 9312cd8709132835878bdbe17f81d1b3e9fa7f45 (diff) | |
parent | daa9db305a5ae2c0c5b0c2425d6482de6dee7b2c (diff) |
merging latest changes
Diffstat (limited to 'indra/newview/llspeakingindicatormanager.cpp')
-rw-r--r-- | indra/newview/llspeakingindicatormanager.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/indra/newview/llspeakingindicatormanager.cpp b/indra/newview/llspeakingindicatormanager.cpp index 76da7d1aee..07e9371124 100644 --- a/indra/newview/llspeakingindicatormanager.cpp +++ b/indra/newview/llspeakingindicatormanager.cpp @@ -237,18 +237,9 @@ void SpeakingIndicatorManager::switchSpeakerIndicators(const speaker_ids_t& spea { was_found = true; LLSpeakingIndicator* indicator = (*it_indicator).second; + was_switched_on = was_switched_on || switch_on; - BOOL switch_current_on = switch_on; - - // we should show indicator for specified voice session only if this is current channel. EXT-5562. - if (switch_current_on) - { - switch_current_on = indicator->getTargetSessionID() == session_id; - LL_DEBUGS("SpeakingIndicator") << "Session: " << session_id << ", target: " << indicator->getTargetSessionID() << ", the same? = " << switch_current_on << LL_ENDL; - } - was_switched_on = was_switched_on || switch_current_on; - - indicator->switchIndicator(switch_current_on); + indicator->switchIndicator(switch_on); } if (was_found) |