diff options
author | James Cook <james@lindenlab.com> | 2010-05-26 10:53:59 -0700 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2010-05-26 10:53:59 -0700 |
commit | 0ebdba45f6fbcecfe0aa63bb37ddcde2efba6d87 (patch) | |
tree | dcfb58e0756c0034075345363559e068f53e8f2a /indra/newview/skins/default/textures | |
parent | dd672e6dfbe6347e7498fb32b9cade6a2133f4a8 (diff) | |
parent | 74279f551b84a409af52634df4b7d78294a818dc (diff) |
Merge with dessie/viewer-public to get Callum's webkit changes
Diffstat (limited to 'indra/newview/skins/default/textures')
-rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 5 | ||||
-rw-r--r-- | indra/newview/skins/default/textures/widgets/bevel_background.png | bin | 0 -> 365 bytes | |||
-rw-r--r-- | indra/newview/skins/default/textures/widgets/buy_off.png | bin | 0 -> 54754 bytes | |||
-rw-r--r-- | indra/newview/skins/default/textures/widgets/buy_over.png | bin | 0 -> 54772 bytes | |||
-rw-r--r-- | indra/newview/skins/default/textures/widgets/buy_press.png | bin | 0 -> 54861 bytes |
5 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 4638c32886..216533e1d8 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -652,4 +652,9 @@ with the same filename but different name <texture name="Progress_11" file_name="icons/Progress_11.png" preload="true" /> <texture name="Progress_12" file_name="icons/Progress_12.png" preload="true" /> + <texture name="bevel_background" file_name="widgets/bevel_background.png" preload="true" scale.left="12" scale.top="15" scale.right="120" scale.bottom="2"/> + <texture name="buy_off" file_name="widgets/buy_off.png" preload="true" scale.left="2" scale.top="15" scale.right="67" scale.bottom="4"/> + <texture name="buy_over" file_name="widgets/buy_over.png" preload="true" scale.left="2" scale.top="15" scale.right="67" scale.bottom="4"/> + <texture name="buy_press" file_name="widgets/buy_press.png" preload="true" scale.left="2" scale.top="15" scale.right="67" scale.bottom="4"/> + </textures> diff --git a/indra/newview/skins/default/textures/widgets/bevel_background.png b/indra/newview/skins/default/textures/widgets/bevel_background.png Binary files differnew file mode 100644 index 0000000000..fb5067503d --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/bevel_background.png diff --git a/indra/newview/skins/default/textures/widgets/buy_off.png b/indra/newview/skins/default/textures/widgets/buy_off.png Binary files differnew file mode 100644 index 0000000000..961ad071d4 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/buy_off.png diff --git a/indra/newview/skins/default/textures/widgets/buy_over.png b/indra/newview/skins/default/textures/widgets/buy_over.png Binary files differnew file mode 100644 index 0000000000..0be19f8a31 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/buy_over.png diff --git a/indra/newview/skins/default/textures/widgets/buy_press.png b/indra/newview/skins/default/textures/widgets/buy_press.png Binary files differnew file mode 100644 index 0000000000..d6f587464d --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/buy_press.png |