diff options
| author | Lynx Linden <lynx@lindenlab.com> | 2009-11-12 15:46:51 +0000 |
|---|---|---|
| committer | Lynx Linden <lynx@lindenlab.com> | 2009-11-12 15:46:51 +0000 |
| commit | a4375f8a3023912bbb11e8c76ef574807dc1afde (patch) | |
| tree | a673317fd56459f05b484f7197821e4b78d0795a /indra/newview/llimview.cpp | |
| parent | 79e6171b266f15e5d332e7eacdc9807add48f0da (diff) | |
DEV-41324 DEV-41331: Improvements to the Avaline voice workflow.
Don't show the "Start IM" button in the incoming call request for an
Avaline call. And display the phone number of the incoming call as the
avatar name, instead of "(???) (???)".
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 23767d119d..ac21c5f4b0 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -1260,6 +1260,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"); |