Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Radar] WHAT?! Why wasn't this committed last night? I know it was... what the heck...

Browse Source
This commit is contained in:
Inusaito Sayori
2014-04-16 16:08:20 -04:00
parent 00336de59a
commit 57fe7d9ad0
1 changed files with 63 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
indra/newview/llfloateravatarlist.cpp
View File

@@ -839,69 +839,77 @@ void LLFloaterAvatarList::refreshAvatarList()
alt.value = temp; alt.value = temp;
LLScrollListCell::Params act; LLScrollListCell::Params act;
act.column = "activity"; static const LLCachedControl<bool> hide_act("RadarColumnActivityHidden");
act.type = "icon"; if (!hide_act)
switch(entry->getActivity())
{ {
case LLAvatarListEntry::ACTIVITY_MOVING: act.column = "activity";
act.value = "inv_item_animation.tga"; act.type = "icon";
act.tool_tip = getString("Moving"); switch(entry->getActivity())
break; {
case LLAvatarListEntry::ACTIVITY_GESTURING: case LLAvatarListEntry::ACTIVITY_MOVING:
act.value = "inv_item_gesture.tga"; act.value = "inv_item_animation.tga";
act.tool_tip = getString("Playing a gesture"); act.tool_tip = getString("Moving");
break; break;
case LLAvatarListEntry::ACTIVITY_SOUND: case LLAvatarListEntry::ACTIVITY_GESTURING:
act.value = "inv_item_sound.tga"; act.value = "inv_item_gesture.tga";
act.tool_tip = getString("Playing a sound"); act.tool_tip = getString("Playing a gesture");
break; break;
case LLAvatarListEntry::ACTIVITY_REZZING: case LLAvatarListEntry::ACTIVITY_SOUND:
act.value = "ff_edit_theirs.tga"; act.value = "inv_item_sound.tga";
act.tool_tip = getString("Rezzing objects"); act.tool_tip = getString("Playing a sound");
break; break;
case LLAvatarListEntry::ACTIVITY_PARTICLES: case LLAvatarListEntry::ACTIVITY_REZZING:
act.value = "particles_scan.tga"; act.value = "ff_edit_theirs.tga";
act.tool_tip = getString("Creating particles"); act.tool_tip = getString("Rezzing objects");
break; break;
case LLAvatarListEntry::ACTIVITY_NEW: case LLAvatarListEntry::ACTIVITY_PARTICLES:
act.value = "avatar_new.tga"; act.value = "particles_scan.tga";
act.tool_tip = getString("Just arrived"); act.tool_tip = getString("Creating particles");
break; break;
case LLAvatarListEntry::ACTIVITY_TYPING: case LLAvatarListEntry::ACTIVITY_NEW:
act.value = "avatar_typing.tga"; act.value = "avatar_new.tga";
act.tool_tip = getString("Typing"); act.tool_tip = getString("Just arrived");
break; break;
default: case LLAvatarListEntry::ACTIVITY_TYPING:
break; act.value = "avatar_typing.tga";
act.tool_tip = getString("Typing");
break;
default:
break;
}
} }
LLScrollListCell::Params voice; LLScrollListCell::Params voice;
voice.column("voice"); static const LLCachedControl<bool> hide_voice("RadarColumnVoiceHidden");
voice.type("icon"); if (!hide_voice)
// transplant from llparticipantlist.cpp, update accordingly.
if (LLPointer<LLSpeaker> speakerp = speakermgr.findSpeaker(av_id))
{ {
if (speakerp->mStatus == LLSpeaker::STATUS_MUTED) voice.column("voice");
voice.type("icon");
// transplant from llparticipantlist.cpp, update accordingly.
if (LLPointer<LLSpeaker> speakerp = speakermgr.findSpeaker(av_id))
{ {
voice.value("mute_icon.tga"); if (speakerp->mStatus == LLSpeaker::STATUS_MUTED)
voice.color(speakerp->mModeratorMutedVoice ? ascent_muted_color : LLColor4(1.f, 71.f / 255.f, 71.f / 255.f, 1.f));
}
else
{
switch(llmin(2, llfloor((speakerp->mSpeechVolume / LLVoiceClient::OVERDRIVEN_POWER_LEVEL) * 3.f)))
{ {
case 0: voice.value("mute_icon.tga");
voice.value("icn_active-speakers-dot-lvl0.tga"); voice.color(speakerp->mModeratorMutedVoice ? ascent_muted_color : LLColor4(1.f, 71.f / 255.f, 71.f / 255.f, 1.f));
break; }
case 1: else
voice.value("icn_active-speakers-dot-lvl1.tga"); {
break; switch(llmin(2, llfloor((speakerp->mSpeechVolume / LLVoiceClient::OVERDRIVEN_POWER_LEVEL) * 3.f)))
case 2: {
voice.value("icn_active-speakers-dot-lvl2.tga"); case 0:
break; voice.value("icn_active-speakers-dot-lvl0.tga");
break;
case 1:
voice.value("icn_active-speakers-dot-lvl1.tga");
break;
case 2:
voice.value("icn_active-speakers-dot-lvl2.tga");
break;
}
// non voice speakers have hidden icons, render as transparent
voice.color(speakerp->mStatus > LLSpeaker::STATUS_VOICE_ACTIVE ? LLColor4::transparent : speakerp->mDotColor);
} }
// non voice speakers have hidden icons, render as transparent
voice.color(speakerp->mStatus > LLSpeaker::STATUS_VOICE_ACTIVE ? LLColor4::transparent : speakerp->mDotColor);
} }
} }
@@ -963,9 +971,7 @@ void LLFloaterAvatarList::refreshAvatarList()
element.columns.add(dist); element.columns.add(dist);
element.columns.add(pos); element.columns.add(pos);
element.columns.add(alt); element.columns.add(alt);
static const LLCachedControl<bool> hide_act("RadarColumnActivityHidden");
if (!hide_act) element.columns.add(act); if (!hide_act) element.columns.add(act);
static const LLCachedControl<bool> hide_voice("RadarColumnVoiceHidden");
if (!hide_voice) element.columns.add(voice); if (!hide_voice) element.columns.add(voice);
element.columns.add(agep); element.columns.add(agep);
element.columns.add(time); element.columns.add(time);