diff options
| author | Andrew Dyukov <adyukov@productengine.com> | 2009-12-04 13:46:58 +0200 |
|---|---|---|
| committer | Andrew Dyukov <adyukov@productengine.com> | 2009-12-04 13:46:58 +0200 |
| commit | 96a11910b19254e180247f76b9c0c201bbdf178c (patch) | |
| tree | 60b093b458503e174e66b4f27fde9e4d090f328c /indra | |
| parent | ebdb78ef3b25247fd86f48833004b4254ca8e360 (diff) | |
Fixed normal bug EXT-1710 (IM & Chat: System messages should have
SL icon and title). "i" icon is temporarily used, changing it in
xml to SL icon moved to new bug- EXT-3132.
--HG--
branch : product-engine
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llchathistory.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index 96b5ae5908..efe9ea4c35 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -211,6 +211,10 @@ public: { icon->setValue(chat.mFromID); } + else if (userName->getValue().asString()==LLTrans::getString("SECOND_LIFE")) + { + icon->setValue(LLSD("SL_Logo")); + } } diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 607b33fbb1..9c7726def3 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -481,6 +481,7 @@ with the same filename but different name <texture name="SliderThumb_Off" file_name="widgets/SliderThumb_Off.png" /> <texture name="SliderThumb_Disabled" file_name="widgets/SliderThumb_Disabled.png" /> <texture name="SliderThumb_Press" file_name="widgets/SliderThumb_Press.png" /> + <texture name="SL_Logo" file_name="map_infohub.tga" /> <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" /> |