diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llimview.cpp | 23 | ||||
| -rw-r--r-- | indra/newview/llimview.h | 3 |
2 files changed, 14 insertions, 12 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index d34bab8c4d..a7ce027416 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -1498,7 +1498,10 @@ void LLCallDialog::draw() void LLCallDialog::setIcon(const LLSD& session_id, const LLSD& participant_id) { - bool is_group = gAgent.isInGroup(session_id); + // *NOTE: 12/28/2009: check avaline calls: LLVoiceClient::isParticipantAvatar returns false for them + bool participant_is_avatar = LLVoiceClient::getInstance()->isParticipantAvatar(session_id); + + bool is_group = participant_is_avatar && gAgent.isInGroup(session_id); LLAvatarIconCtrl* avatar_icon = getChild<LLAvatarIconCtrl>("avatar_icon"); LLGroupIconCtrl* group_icon = getChild<LLGroupIconCtrl>("group_icon"); @@ -1510,11 +1513,15 @@ void LLCallDialog::setIcon(const LLSD& session_id, const LLSD& participant_id) { group_icon->setValue(session_id); } - else + else if (participant_is_avatar) { avatar_icon->setValue(participant_id); } - + else + { + avatar_icon->setValue("Avaline_Icon"); + avatar_icon->setToolTip(std::string("")); + } } bool LLOutgoingCallDialog::lifetimeHasExpired() @@ -1734,15 +1741,7 @@ BOOL LLIncomingCallDialog::postBuild() LLUICtrl* caller_name_widget = getChild<LLUICtrl>("caller name"); caller_name_widget->setValue(caller_name + " " + call_type); - if (is_avatar) - { - setIcon(session_id, caller_id); - } - else - { - LLAvatarIconCtrl* icon = getChild<LLAvatarIconCtrl>("avatar_icon"); - icon->setValue("Avaline_Icon"); - } + setIcon(session_id, caller_id); childSetAction("Accept", onAccept, this); childSetAction("Reject", onReject, this); diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h index b0f5f3d813..11860d0efb 100644 --- a/indra/newview/llimview.h +++ b/indra/newview/llimview.h @@ -506,6 +506,9 @@ protected: * Sets icon depend on session. * * If passed session_id is a group id group icon will be shown, otherwise avatar icon for participant_id + * + * @param session_id - UUID of session + * @param participant_id - UUID of other participant */ void setIcon(const LLSD& session_id, const LLSD& participant_id); |