From 2d25eb18adc0c2c97c63a8e02f2274362672137c Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Sat, 17 Nov 2012 13:24:41 -0800
Subject: CHUI-479 : Clean up unecessary tracking code
---
indra/newview/llconversationview.cpp | 8 --------
indra/newview/llfloaterimcontainer.cpp | 2 --
indra/newview/llfloaterimsessiontab.cpp | 1 -
indra/newview/lloutputmonitorctrl.cpp | 27 ++-------------------------
indra/newview/llspeakingindicatormanager.cpp | 8 --------
indra/newview/llspeakingindicatormanager.h | 2 +-
6 files changed, 3 insertions(+), 45 deletions(-)
(limited to 'indra')
diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp
index d971c943f0..64618fabba 100755
--- a/indra/newview/llconversationview.cpp
+++ b/indra/newview/llconversationview.cpp
@@ -308,7 +308,6 @@ void LLConversationViewSession::refresh()
}
// Update all speaking indicators
- llinfos << "Merov debug : LLConversationViewSession::refresh, updateSpeakingIndicators" << llendl;
LLSpeakingIndicatorManager::updateSpeakingIndicators();
// Do the regular upstream refresh
@@ -455,7 +454,6 @@ S32 LLConversationViewParticipant::arrange(S32* width, S32* height)
void LLConversationViewParticipant::onCurrentVoiceSessionChanged(const LLUUID& session_id)
{
- llinfos << "Merov debug : onCurrentVoiceSessionChanged begin, uuid = " << mUUID << ", session_id = " << session_id << llendl;
LLConversationItemParticipant* participant_model = dynamic_cast<LLConversationItemParticipant*>(getViewModelItem());
if (participant_model)
@@ -477,12 +475,6 @@ void LLConversationViewParticipant::refresh()
// *TODO: We should also do something with vmi->isModerator() to echo that state in the UI somewhat
mSpeakingIndicator->setIsMuted(participant_model->isMuted());
- //LLConversationItemSession* parent_session = participant_model->getParentSession();
- //if (parent_session)
- //{
- // bool is_active = (parent_session->getUUID() == session_id);
- // mSpeakingIndicator->switchIndicator(is_active);
- //}
// Do the regular upstream refresh
LLFolderViewItem::refresh();
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index bd692aa850..78b930984f 100644
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -110,7 +110,6 @@ void LLFloaterIMContainer::sessionActivated(const LLUUID& session_id, const std:
void LLFloaterIMContainer::sessionVoiceOrIMStarted(const LLUUID& session_id)
{
- llinfos << "Merov debug : sessionVoiceOrIMStarted, uuid = " << session_id << llendl;
addConversationListItem(session_id);
LLFloaterIMSessionTab::addToHost(session_id);
}
@@ -1310,7 +1309,6 @@ LLConversationItem* LLFloaterIMContainer::addConversationListItem(const LLUUID&
bool LLFloaterIMContainer::removeConversationListItem(const LLUUID& uuid, bool change_focus)
{
- llinfos << "Merov debug : removeConversationListItem, uuid = " << uuid << llendl;
// Delete the widget and the associated conversation item
// Note : since the mConversationsItems is also the listener to the widget, deleting
// the widget will also delete its listener
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp
index 22131eac49..c2c6e739e9 100644
--- a/indra/newview/llfloaterimsessiontab.cpp
+++ b/indra/newview/llfloaterimsessiontab.cpp
@@ -725,7 +725,6 @@ void LLFloaterIMSessionTab::onClose(bool app_quitting)
LLFloaterIMContainer* im_box = LLFloaterIMContainer::findInstance();
if (im_box)
{
- llinfos << "Merov debug : LLFloaterIMSessionTab::onClose, mKey = " << mKey << llendl;
im_box->removeConversationListItem(mKey);
}
}
diff --git a/indra/newview/lloutputmonitorctrl.cpp b/indra/newview/lloutputmonitorctrl.cpp
index 536f1fbd73..e4621a7fc3 100644
--- a/indra/newview/lloutputmonitorctrl.cpp
+++ b/indra/newview/lloutputmonitorctrl.cpp
@@ -48,8 +48,6 @@ LLColor4 LLOutputMonitorCtrl::sColorBound;
//F32 LLOutputMonitorCtrl::sRectWidthRatio = 0.f;
//F32 LLOutputMonitorCtrl::sRectHeightRatio = 0.f;
-static LLUUID test_uuid("c684ce33-89fb-4544-8f7b-dae243c8b214");
-
LLOutputMonitorCtrl::Params::Params()
: draw_border("draw_border"),
image_mute("image_mute"),
@@ -280,44 +278,24 @@ BOOL LLOutputMonitorCtrl::handleMouseUp(S32 x, S32 y, MASK mask)
void LLOutputMonitorCtrl::setSpeakerId(const LLUUID& speaker_id, const LLUUID& session_id/* = LLUUID::null*/, bool show_other_participants_speaking /* = false */)
{
- bool test_on = (speaker_id == test_uuid);
- if (test_on)
- {
- llinfos << "Merov debug : setSpeakerId, this = " << this << ", session_id = " << session_id << llendl;
- }
if (speaker_id.isNull() && mSpeakerId.notNull())
{
LLSpeakingIndicatorManager::unregisterSpeakingIndicator(mSpeakerId, this);
}
- if (speaker_id.isNull() || speaker_id == mSpeakerId)
+ if (speaker_id.isNull() || (speaker_id == mSpeakerId))
{
- if (test_on)
- {
- llinfos << "Merov debug : setSpeakerId, nothing done because mSpeakerId == speaker_id" << llendl;
- }
return;
}
if (mSpeakerId.notNull())
{
- if (test_on)
- {
- llinfos << "Merov debug : setSpeakerId, unregisterSpeakingIndicator" << llendl;
- }
// Unregister previous registration to avoid crash. EXT-4782.
- if (getTargetSessionID() == session_id)
- {
- LLSpeakingIndicatorManager::unregisterSpeakingIndicator(mSpeakerId, this);
- }
+ LLSpeakingIndicatorManager::unregisterSpeakingIndicator(mSpeakerId, this);
}
mShowParticipantsSpeaking = show_other_participants_speaking;
mSpeakerId = speaker_id;
- if (test_on)
- {
- llinfos << "Merov debug : setSpeakerId, registerSpeakingIndicator" << llendl;
- }
LLSpeakingIndicatorManager::registerSpeakingIndicator(mSpeakerId, this, session_id);
//mute management
@@ -345,7 +323,6 @@ void LLOutputMonitorCtrl::onChange()
// virtual
void LLOutputMonitorCtrl::switchIndicator(bool switch_on)
{
- llinfos << "Merov debug : switchIndicator, mSpeakerId = " << mSpeakerId << ", switch_on = " << switch_on << llendl;
// ensure indicator is visible in case it is not in visible chain
// to be called when parent became visible next time to notify parent that visibility is changed.
setVisible(TRUE);
diff --git a/indra/newview/llspeakingindicatormanager.cpp b/indra/newview/llspeakingindicatormanager.cpp
index d9f9ed5966..76da7d1aee 100644
--- a/indra/newview/llspeakingindicatormanager.cpp
+++ b/indra/newview/llspeakingindicatormanager.cpp
@@ -155,7 +155,6 @@ void SpeakingIndicatorManager::registerSpeakingIndicator(const LLUUID& speaker_i
BOOL is_in_same_voice = LLVoiceClient::getInstance()->isParticipant(speaker_id);
speakers_uuids.insert(speaker_id);
- llinfos << "Merov debug : registerSpeakingIndicator call switchSpeakerIndicators, switch = " << is_in_same_voice << llendl;
switchSpeakerIndicators(speakers_uuids, is_in_same_voice);
}
@@ -196,7 +195,6 @@ SpeakingIndicatorManager::~SpeakingIndicatorManager()
void SpeakingIndicatorManager::sOnCurrentChannelChanged(const LLUUID& /*session_id*/)
{
- llinfos << "Merov debug : sOnCurrentChannelChanged call switchSpeakerIndicators, FALSE" << llendl;
switchSpeakerIndicators(mSwitchedIndicatorsOn, FALSE);
mSwitchedIndicatorsOn.clear();
}
@@ -210,16 +208,12 @@ void SpeakingIndicatorManager::onParticipantsChanged()
LL_DEBUGS("SpeakingIndicator") << "Switching all OFF, count: " << mSwitchedIndicatorsOn.size() << LL_ENDL;
// switch all indicators off
- llinfos << "Merov debug : onParticipantsChanged call switchSpeakerIndicators, FALSE" << llendl;
switchSpeakerIndicators(mSwitchedIndicatorsOn, FALSE);
- llinfos << "Merov debug : onParticipantsChanged call switchSpeakerIndicators, end FALSE switch" << llendl;
mSwitchedIndicatorsOn.clear();
LL_DEBUGS("SpeakingIndicator") << "Switching all ON, count: " << speakers_uuids.size() << LL_ENDL;
// then switch current voice participants indicators on
- llinfos << "Merov debug : onParticipantsChanged call switchSpeakerIndicators, TRUE" << llendl;
switchSpeakerIndicators(speakers_uuids, TRUE);
- llinfos << "Merov debug : onParticipantsChanged call switchSpeakerIndicators, end TRUE switch" << llendl;
}
void SpeakingIndicatorManager::switchSpeakerIndicators(const speaker_ids_t& speakers_uuids, BOOL switch_on)
@@ -230,7 +224,6 @@ void SpeakingIndicatorManager::switchSpeakerIndicators(const speaker_ids_t& spea
{
session_id = voice_channel->getSessionID();
}
- llinfos << "Merov debug : switchSpeakerIndicators, switch_on = " << switch_on << ", voice channel = " << session_id << llendl;
speaker_ids_t::const_iterator it_uuid = speakers_uuids.begin();
for (; it_uuid != speakers_uuids.end(); ++it_uuid)
@@ -255,7 +248,6 @@ void SpeakingIndicatorManager::switchSpeakerIndicators(const speaker_ids_t& spea
}
was_switched_on = was_switched_on || switch_current_on;
- llinfos << "Merov debug : indicator for " << *it_uuid << ", switch_current_on = " << switch_current_on << ", session = " << indicator->getTargetSessionID() << llendl;
indicator->switchIndicator(switch_current_on);
}
diff --git a/indra/newview/llspeakingindicatormanager.h b/indra/newview/llspeakingindicatormanager.h
index 8ee368e258..e5afcd1cb7 100644
--- a/indra/newview/llspeakingindicatormanager.h
+++ b/indra/newview/llspeakingindicatormanager.h
@@ -37,7 +37,7 @@ public:
virtual ~LLSpeakingIndicator(){}
virtual void switchIndicator(bool switch_on) = 0;
-//private:
+private:
friend class SpeakingIndicatorManager;
// Accessors for target voice session UUID.
// They are intended to be used only from SpeakingIndicatorManager to ensure target session is
--
cgit v1.2.3