livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CHUI-479 : WIP : More tracing

master
Merov Linden 2012-11-14 20:00:01 -08:00
parent a5d6375dd9
commit bd62d1d337
4 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
indra/newview/llconversationmodel.cpp
View File

@ -349,15 +349,21 @@ const bool LLConversationItemSession::getTime(F64& time) const
return has_time;
}
void LLConversationItemSession::dumpDebugData()
void LLConversationItemSession::dumpDebugData(bool dump_children)
{
// Session info
llinfos << "Merov debug : session " << this << ", uuid = " << mUUID << ", name = " << mName << ", is loaded = " << mIsLoaded << llendl;
LLConversationItemParticipant* participant = NULL;
child_list_t::iterator iter;
for (iter = mChildren.begin(); iter != mChildren.end(); iter++)
// Children info
if (dump_children)
{
participant = dynamic_cast<LLConversationItemParticipant*>(*iter);
participant->dumpDebugData();
for (child_list_t::iterator iter = mChildren.begin(); iter != mChildren.end(); iter++)
{
LLConversationItemParticipant* participant = dynamic_cast<LLConversationItemParticipant*>(*iter);
if (participant)
{
participant->dumpDebugData();
}
}
}
}

2
indra/newview/llconversationmodel.h
View File

@ -168,7 +168,7 @@ public:
void addVoiceOptions(menuentry_vec_t& items);
virtual const bool getTime(F64& time) const;
void dumpDebugData();
void dumpDebugData(bool dump_children = false);
private:
bool mIsLoaded; // true if at least one participant has been added to the session, false otherwise

8
indra/newview/lloutputmonitorctrl.cpp
View File

@ -48,6 +48,8 @@ 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"),
@ -278,7 +280,6 @@ 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 */)
{
static LLUUID test_uuid("c684ce33-89fb-4544-8f7b-dae243c8b214");
bool test_on = (speaker_id == test_uuid);
if (test_on)
{
@ -345,6 +346,11 @@ void LLOutputMonitorCtrl::onChange()
void LLOutputMonitorCtrl::switchIndicator(bool switch_on)
{
llinfos << "Merov debug : switchIndicator, mSpeakerId = " << mSpeakerId << ", switch_on = " << switch_on << llendl;
bool test_on = (mSpeakerId == test_uuid);
if (test_on && !switch_on)
{
llinfos << "Merov debug : switching agent off!" << 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);

8
indra/newview/llspeakingindicatormanager.cpp
View File

@ -224,13 +224,13 @@ void SpeakingIndicatorManager::onParticipantsChanged()
void SpeakingIndicatorManager::switchSpeakerIndicators(const speaker_ids_t& speakers_uuids, BOOL switch_on)
{
llinfos << "Merov debug : switchSpeakerIndicators, switch_on = " << switch_on << llendl;
LLVoiceChannel* voice_channel = LLVoiceChannel::getCurrentVoiceChannel();
LLUUID session_id;
if (voice_channel)
{
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,17 +255,17 @@ 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);
}
if (was_found)
{
LL_DEBUGS("SpeakingIndicator") << mSpeakingIndicators.count(*it_uuid) << " indicators where found" << LL_ENDL;
LL_DEBUGS("SpeakingIndicator") << mSpeakingIndicators.count(*it_uuid) << " indicators were found" << LL_ENDL;
if (switch_on && !was_switched_on)
{
LL_DEBUGS("SpeakingIndicator") << "but non of them where switched on" << LL_ENDL;
LL_DEBUGS("SpeakingIndicator") << "but none of them were switched on" << LL_ENDL;
}
if (was_switched_on)