diff options
| author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-10 14:35:29 +0200 |
|---|---|---|
| committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-10 14:35:29 +0200 |
| commit | 3eeb4e6599a87595d13b500074a22d88a1509983 (patch) | |
| tree | bdf06cdc789bc43d40319599132c71dc11afc605 | |
| parent | 8288530c45616a37dc7eef0b517b4383d3404ea6 (diff) | |
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
| -rw-r--r-- | indra/newview/llchathistory.cpp | 7 | ||||
| -rw-r--r-- | indra/newview/llchatitemscontainerctrl.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/skins/default/textures/icons/object_icon.png | bin | 0 -> 973 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 1 |
4 files changed, 11 insertions, 2 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index c125f84c58..13a5df353d 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -289,7 +289,12 @@ public: 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 f772aea4bd..e164aa8fc4 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 Binary files differnew file mode 100644 index 0000000000..c9fbde987a --- /dev/null +++ b/indra/newview/skins/default/textures/icons/object_icon.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 309c2a5f30..18d1779702 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" /> |
