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

EXT-7266 FIX change default icon id tofrom object icon to id that comes with message 

Reviwed by Igor Borovkov at https://codereview.productengine.com/secondlife/r/371/

--HG--
branch : product-engine
master
Yuri Chebotarev 2010-05-17 18:39:11 +03:00
parent 4683283a66
commit fcea61df76
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llchatitemscontainerctrl.cpp
View File

@ -326,12 +326,14 @@ void LLNearbyChatToastPanel::draw()
if(icon)
{
icon->setDrawTooltip(mSourceType == CHAT_SOURCE_AGENT);
if(mSourceType == CHAT_SOURCE_AGENT)
icon->setValue(mFromID);
if(mSourceType == CHAT_SOURCE_OBJECT)
icon->setValue(LLSD("OBJECT_Icon"));
else if(mSourceType == CHAT_SOURCE_SYSTEM)
icon->setValue(LLSD("SL_Logo"));
else
icon->setValue(LLSD("OBJECT_Icon"));
else if(mSourceType == CHAT_SOURCE_AGENT)
icon->setValue(mFromID);
else if(!mFromID.isNull())
icon->setValue(mFromID);
}
mIsDirty = false;
}