From daed86bbb0fa1ee394a83d597cd5846809d14ba3 Mon Sep 17 00:00:00 2001 From: Igor Borovkov Date: Sat, 26 Dec 2009 16:58:05 +0200 Subject: [PATCH] implemented EXT-3682 Dedicated icon is required for AvaLine callers in the VCP --HG-- branch : product-engine --- indra/newview/llavatarlistitem.h | 3 ++- indra/newview/llcallfloater.cpp | 3 +++ indra/newview/llimview.cpp | 9 ++++++++- .../textures/icons/avaline_default_icon.jpg | Bin 0 -> 3951 bytes .../newview/skins/default/textures/textures.xml | 2 ++ 5 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 indra/newview/skins/default/textures/icons/avaline_default_icon.jpg diff --git a/indra/newview/llavatarlistitem.h b/indra/newview/llavatarlistitem.h index 8e359f16b3..79303b55cc 100644 --- a/indra/newview/llavatarlistitem.h +++ b/indra/newview/llavatarlistitem.h @@ -114,6 +114,8 @@ protected: */ LLOutputMonitorCtrl* mSpeakingIndicator; + LLAvatarIconCtrl* mAvatarIcon; + private: typedef enum e_online_status { @@ -133,7 +135,6 @@ private: typedef std::map icon_color_map_t; static icon_color_map_t& getItemIconColorMap(); - LLAvatarIconCtrl* mAvatarIcon; LLTextBox* mAvatarName; LLTextBox* mLastInteractionTime; LLStyle::Params mAvatarNameStyle; diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp index 581890c4fd..1b4c274bfb 100644 --- a/indra/newview/llcallfloater.cpp +++ b/indra/newview/llcallfloater.cpp @@ -40,6 +40,7 @@ #include "llagent.h" #include "llagentdata.h" // for gAgentID +#include "llavatariconctrl.h" #include "llavatarlist.h" #include "llbottomtray.h" #include "llimfloater.h" @@ -67,6 +68,8 @@ public: showLastInteractionTime(false); setShowProfileBtn(false); setShowInfoBtn(false); + mAvatarIcon->setValue("Avaline_Icon"); + mAvatarIcon->setToolTip(std::string("")); } return rv; } 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("caller name"); caller_name_widget->setValue(caller_name + " " + call_type); LLAvatarIconCtrl* icon = getChild("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); diff --git a/indra/newview/skins/default/textures/icons/avaline_default_icon.jpg b/indra/newview/skins/default/textures/icons/avaline_default_icon.jpg new file mode 100644 index 0000000000000000000000000000000000000000..3bb7f7183cd751eddcabd75da8b9f1dc9e86f0f3 GIT binary patch literal 3951 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 WUeXX-#{TY%05L+c{Xz1b&ioHPB}z{K literal 0 HcmV?d00001 diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 8a9126208a..95db84cb32 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -70,6 +70,8 @@ with the same filename but different name + +