From 3eeb4e6599a87595d13b500074a22d88a1509983 Mon Sep 17 00:00:00 2001
From: Ychebotarev ProductEngine <ychebotarev@productengine.com>
Date: Wed, 10 Feb 2010 14:35:29 +0200
Subject: [PATCH] partitial fix for normal task EXT-2957 [BSI] Implement object
icon for chat from objects, instead of using generic image for missing
profile picture
--HG--
branch : product-engine
---
indra/newview/llchathistory.cpp | 7 ++++++-
indra/newview/llchatitemscontainerctrl.cpp | 5 ++++-
.../skins/default/textures/icons/object_icon.png | Bin 0 -> 973 bytes
indra/newview/skins/default/textures/textures.xml | 1 +
4 files changed, 11 insertions(+), 2 deletions(-)
create mode 100644 indra/newview/skins/default/textures/icons/object_icon.png
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index c125f84c58e..13a5df353d0 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -289,7 +289,12 @@ class LLChatHistoryHeader: public LLPanel
if(!chat.mFromID.isNull())
{
- icon->setValue(chat.mFromID);
+ if(mSourceType != CHAT_SOURCE_AGENT)
+ icon->setValue(LLSD("OBJECT_Icon"));
+ else
+ icon->setValue(chat.mFromID);
+
+
}
else if (userName->getValue().asString()==LLTrans::getString("SECOND_LIFE"))
{
diff --git a/indra/newview/llchatitemscontainerctrl.cpp b/indra/newview/llchatitemscontainerctrl.cpp
index f772aea4bd8..e164aa8fc45 100644
--- a/indra/newview/llchatitemscontainerctrl.cpp
+++ b/indra/newview/llchatitemscontainerctrl.cpp
@@ -321,7 +321,10 @@ void LLNearbyChatToastPanel::draw()
if(icon)
{
icon->setDrawTooltip(mSourceType == CHAT_SOURCE_AGENT);
- icon->setValue(mFromID);
+ if(mSourceType == CHAT_SOURCE_AGENT)
+ icon->setValue(mFromID);
+ else
+ icon->setValue(LLSD("OBJECT_Icon"));
}
mIsDirty = false;
}
diff --git a/indra/newview/skins/default/textures/icons/object_icon.png b/indra/newview/skins/default/textures/icons/object_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..c9fbde987a6615c783207ad967cb0c6c49670d04
GIT binary patch
literal 973
zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H3?x5i&EW)6k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+7#jk7LR@b@e_FC^-ozc7DpoG|`}c3xmNji{ZBuq_S$X`>
zxqG)y-M&$@WbTGj$6kN@`0~U1yeYlAFP>d=cyHCJMUP&;YFWSX+T#ba_U*jz;BNie
zrJufi-Fg1Bkc4<hVQ%5#*?Eg*^=w_Y_3X*bXHU%Azw6hZ-@ktUZr{ARVcqhJ5AJ3!
zn4Y_E=8Qet*f}^pe*IduV!@&7m*0Q++`3_voQB%pfB&|gJ9YHtwcmgKlr5is?8enu
zd$%t?dZ2Z~%D10C9k_Ps-pl9HrcK+scklHlk7n=Mn$g=nVf%)XInzFT{W4+G+8Z}+
zeE;?9*sW`-M*3gAf4^}5PDn_|tvh!<fB)9Gc}?HO)#VFjUV3;>Twb<+%H+zG3v1Ra
z-hScq*PlNwKe|6}{`@_c&pUd!-+cOb)3L*?n^q;voRBeZ>Vkv2uROfJ_1wwx_wQ^!
zf9mGbC%2wHIdk{c*?YH>TN_T_xpm~`)gQlpow#-V!<R4Bs~7+K_wVD^FZqjStvPY{
z_|0pJmo0np=5^tWNgqCZFmSZ1STy_p|Np?4I<kbt2}m`R1o;I6MFtWuSg?Ah1Jgyg
zr;B4q#jTKwFT)uFCD=Z63m&?$w8i6_<nML0!ChXy)sbCWye?XO|M&W=@AETXYO3D7
zzifM+Tfphs=jL*|<;Ax-7)4@(1O?h>tU8qVtogvMP128}c8FGool00b_qZLC+D*<F
zuCIO<H}kB27568KUCOMtd;3CFnINUN<_82?;vY<|J-kNDH2%!I<;q!mQUyP3xiVwQ
z>-fzRm*^=aXl#G_c#4&Pg_%_)pK~j}ipHgfD!JS?(z{pxb#eEM%G>MHnZB|)AXoLc
zR*8mQyA6BMJEgV7oo83IPilxY-n?_3-O(LKPVq9Dm+xYB_MKv=dG43W`AAQWRbOrW
zUs<W_dOS0)Ae!e-S)0mRb?0l3>c8_bs;pw&YVBM&d&<t0*FJ0z7m9B)yKCcC)3rbG
z=C}7@=cJ}Cl89`7{Zygj-NrYMUbHJL^VTlk;>-Kn{`>DA(=;UhinTen)Uik~n3gX!
UsdyE27Z}|Pp00i_>zopr04K;(ZU6uP
literal 0
HcmV?d00001
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 309c2a5f30d..18d1779702f 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -515,6 +515,7 @@ with the same filename but different name
<texture name="SliderThumb_Press" file_name="widgets/SliderThumb_Press.png" />
<texture name="SL_Logo" file_name="icons/SL_Logo.png" preload="true" />
+ <texture name="OBJECT_Icon" file_name="icons/object_icon.png" preload="true" />
<texture name="Snapshot_Off" file_name="bottomtray/Snapshot_Off.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
<texture name="Snapshot_Over" file_name="bottomtray/Snapshot_Over.png" preload="false" />
--
GitLab