livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

implemented EXT-3682 Dedicated icon is required for AvaLine callers in the VCP 

--HG--
branch : product-engine
meow-7.2.2
Igor Borovkov 2009-12-26 16:58:05 +02:00
parent 5e2d18037d
commit daed86bbb0
5 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llavatarlistitem.h
View File

@ -114,6 +114,8 @@ protected:
*/
LLOutputMonitorCtrl* mSpeakingIndicator;
LLAvatarIconCtrl* mAvatarIcon;
private:
typedef enum e_online_status {
@ -133,7 +135,6 @@ private:
typedef std::map<EItemStyle, LLColor4> icon_color_map_t;
static icon_color_map_t& getItemIconColorMap();
LLAvatarIconCtrl* mAvatarIcon;
LLTextBox* mAvatarName;
LLTextBox* mLastInteractionTime;
LLStyle::Params mAvatarNameStyle;

3
indra/newview/llcallfloater.cpp
View File

@ -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;
}

9
indra/newview/llimview.cpp
View File

@ -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);

BIN
indra/newview/skins/default/textures/icons/avaline_default_icon.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.9 KiB

2
indra/newview/skins/default/textures/textures.xml
View File

@ -70,6 +70,8 @@ with the same filename but different name
<texture name="Audio_Over" file_name="icons/Audio_Over.png" preload="false" />
<texture name="Audio_Press" file_name="icons/Audio_Press.png" preload="false" />
<texture name="Avaline_Icon" file_name="icons/avaline_default_icon.jpg" preload="true" />
<texture name="BackArrow_Disabled" file_name="icons/BackArrow_Disabled.png" preload="false" />
<texture name="BackArrow_Off" file_name="icons/BackArrow_Off.png" preload="false" />
<texture name="BackArrow_Press" file_name="icons/BackArrow_Press.png" preload="false" />