diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-01-07 10:14:33 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-01-07 10:14:33 -0500 |
| commit | 61e3c95dbf8282dbce5455a7adc466d9c2108a13 (patch) | |
| tree | 1d7f029348b6a5c5c66413d00898190fc338e8c2 /indra/newview/skins/default/textures | |
| parent | 38ab28511473fb6882bab0d5a1ce3f372c48a171 (diff) | |
| parent | 09c01c4e925833873a83665fe0642637b65e547e (diff) | |
Automated merge up 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 62466e4fa3..e69c5775f0 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -558,11 +558,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" |
