Skip to content
Snippets Groups Projects
Commit 96a11910 authored by Andrew Dyukov's avatar Andrew Dyukov
Browse files

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
parent ebdb78ef
No related branches found
No related tags found
No related merge requests found
...@@ -211,6 +211,10 @@ class LLChatHistoryHeader: public LLPanel ...@@ -211,6 +211,10 @@ class LLChatHistoryHeader: public LLPanel
{ {
icon->setValue(chat.mFromID); icon->setValue(chat.mFromID);
} }
else if (userName->getValue().asString()==LLTrans::getString("SECOND_LIFE"))
{
icon->setValue(LLSD("SL_Logo"));
}
} }
......
...@@ -481,6 +481,7 @@ with the same filename but different name ...@@ -481,6 +481,7 @@ with the same filename but different name
<texture name="SliderThumb_Off" file_name="widgets/SliderThumb_Off.png" /> <texture name="SliderThumb_Off" file_name="widgets/SliderThumb_Off.png" />
<texture name="SliderThumb_Disabled" file_name="widgets/SliderThumb_Disabled.png" /> <texture name="SliderThumb_Disabled" file_name="widgets/SliderThumb_Disabled.png" />
<texture name="SliderThumb_Press" file_name="widgets/SliderThumb_Press.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_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" /> <texture name="Snapshot_Over" file_name="bottomtray/Snapshot_Over.png" preload="false" />
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment