summaryrefslogtreecommitdiff
path: root/indra/newview/llimview.cpp
diff options
context:
space:
mode:
authorIgor Borovkov <iborovkov@productengine.com>2009-12-26 16:58:05 +0200
committerIgor Borovkov <iborovkov@productengine.com>2009-12-26 16:58:05 +0200
commitdaed86bbb0fa1ee394a83d597cd5846809d14ba3 (patch)
tree741723960a337a8575fdd452277d66205da24532 /indra/newview/llimview.cpp
parent5e2d18037d17078c3e0575c1ef72307acda7f9b1 (diff)
implemented EXT-3682 Dedicated icon is required for AvaLine callers in the VCP
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llimview.cpp')
-rw-r--r--indra/newview/llimview.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 388e0c8d8d..37ab144934 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -1712,7 +1712,14 @@ BOOL LLIncomingCallDialog::postBuild()
LLUICtrl* caller_name_widget = getChild<LLUICtrl>("caller name");
caller_name_widget->setValue(caller_name + " " + call_type);
LLAvatarIconCtrl* icon = getChild<LLAvatarIconCtrl>("avatar_icon");
- icon->setValue(caller_id);
+ if (is_avatar)
+ {
+ icon->setValue(caller_id);
+ }
+ else
+ {
+ icon->setValue("Avaline_Icon");
+ }
childSetAction("Accept", onAccept, this);
childSetAction("Reject", onReject, this);