diff options
author | Loren Shih <seraph@lindenlab.com> | 2009-12-11 16:01:44 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2009-12-11 16:01:44 -0500 |
commit | 99590047eb322d76a90c417bf0e6b2ec0e189d52 (patch) | |
tree | eaab40ba586d097bf5c1dd4b6ef673c1284ff477 /indra/newview/skins/default/textures | |
parent | d2b72fe0184fb92f4a79eebd242825fbcc5f32e9 (diff) | |
parent | 1f3a55470919bf451f9c45b454d9bbf815a3e88a (diff) |
automated merge avp->avp
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/skins/default/textures')
-rw-r--r-- | indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png | bin | 0 -> 288 bytes | |||
-rw-r--r-- | indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png | bin | 0 -> 405 bytes | |||
-rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 5 |
3 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png Binary files differnew file mode 100644 index 0000000000..60676b43fd --- /dev/null +++ b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png diff --git a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png Binary files differnew file mode 100644 index 0000000000..98cde96aff --- /dev/null +++ b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 607df10048..24d3512bcb 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -375,7 +375,7 @@ with the same filename but different name <texture name="Parcel_PushNo_Light" file_name="icons/Parcel_PushNo_Light.png" preload="false" /> <texture name="Parcel_R_Light" file_name="icons/Parcel_R_Light.png" preload="false" /> <texture name="Parcel_Scripts_Light" file_name="icons/Parcel_Scripts_Light.png" preload="false" /> - <texture name="Parcel_ScriptsNo_Light" file_name="icons/Parcel_ScriptsNo_Light.png" preload="false" /> + <texture name="Parcel_ScriptsNo_Light" file_name="icons/Parcel_ScriptsNo_Dark.png" preload="false" /> <texture name="Parcel_Voice_Light" file_name="icons/Parcel_Voice_Light.png" preload="false" /> <texture name="Parcel_VoiceNo_Light" file_name="icons/Parcel_VoiceNo_Light.png" preload="false" /> @@ -592,6 +592,9 @@ with the same filename but different name <texture name="Unread_IM" file_name="bottomtray/Unread_IM.png" preload="false" /> <texture name="Unread_Msg" file_name="bottomtray/Unread_Msg.png" preload="false" /> + + <texture name="WellButton_Lit" file_name="bottomtray/WellButton_Lit.png" /> + <texture name="WellButton_Lit_Selected" file_name="bottomtray/WellButton_Lit_Selected.png" /> <texture name="VoicePTT_Lvl1" file_name="bottomtray/VoicePTT_Lvl1.png" preload="false" /> <texture name="VoicePTT_Lvl2" file_name="bottomtray/VoicePTT_Lvl2.png" preload="false" /> |