diff options
author | Don Kjer <don@lindenlab.com> | 2011-01-07 10:48:38 -0800 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2011-01-07 10:48:38 -0800 |
commit | 829c2c86975dd80d13008c38246fa8ea0d10529c (patch) | |
tree | e90bda161771de9f3fcd98e2806e8eed7c4222fc /indra/newview/skins/default/textures | |
parent | a9bc51e6416dd637080c0307de99d5e09d06dcc4 (diff) | |
parent | c132d20a7433e2d09e3521a15497f661fcbd18b8 (diff) |
Merge from viewer-development
Diffstat (limited to 'indra/newview/skins/default/textures')
-rw-r--r-- | indra/newview/skins/default/textures/icons/Web_Profile_Off.png | bin | 0 -> 2961 bytes | |||
-rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/skins/default/textures/icons/Web_Profile_Off.png b/indra/newview/skins/default/textures/icons/Web_Profile_Off.png Binary files differnew file mode 100644 index 0000000000..f5fb774a6f --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Web_Profile_Off.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 89611d8899..2c00120177 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -553,11 +553,11 @@ with the same filename but different name <texture name="Wearables_Divider" file_name="windows/Wearables_Divider.png" preload="false" /> + <texture name="Web_Profile_Off" file_name="icons/Web_Profile_Off.png" preload="false" /> + <texture name="WellButton_Lit" file_name="bottomtray/WellButton_Lit.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" /> <texture name="WellButton_Lit_Selected" file_name="bottomtray/WellButton_Lit_Selected.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" /> - - <texture name="Window_Background" file_name="windows/Window_Background.png" preload="true" scale.left="4" scale.top="24" scale.right="26" scale.bottom="4" /> <texture name="Window_Foreground" file_name="windows/Window_Foreground.png" preload="true" |