diff options
| author | Lynx Linden <lynx@lindenlab.com> | 2009-11-12 18:03:36 +0000 |
|---|---|---|
| committer | Lynx Linden <lynx@lindenlab.com> | 2009-11-12 18:03:36 +0000 |
| commit | c0ff08e0b4af5ce58a47321f39c69c1d24600d1e (patch) | |
| tree | 7626bfcb4589b7a2e27c3b9ea7d8a219aad49929 /indra/newview/llimview.cpp | |
| parent | 74cb5c82a4e5eeb1ef722f73c96f64c4750db2be (diff) | |
| parent | 700085a093c71023703b43ca19e7ba114f2183ff (diff) | |
Automated merge with ssh://hg.lindenlab.com/moss/viewer2voiceparity/
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index a94254e17e..d48aaf8461 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -1195,6 +1195,11 @@ BOOL LLIncomingCallDialog::postBuild() call_type = getString("VoiceInviteAdHoc"); } + // check to see if this is an Avaline call + LLUUID session_id = mPayload["session_id"].asUUID(); + bool is_avatar = LLVoiceClient::getInstance()->isParticipantAvatar(session_id);
+ childSetVisible("Start IM", is_avatar); // no IM for avaline + LLUICtrl* caller_name_widget = getChild<LLUICtrl>("caller name"); caller_name_widget->setValue(caller_name + " " + call_type); LLAvatarIconCtrl* icon = getChild<LLAvatarIconCtrl>("avatar_icon"); |