diff options
author | Monroe Linden <monroe@lindenlab.com> | 2010-08-13 14:01:51 -0700 |
---|---|---|
committer | Monroe Linden <monroe@lindenlab.com> | 2010-08-13 14:01:51 -0700 |
commit | 1dd490ff88e7ee54b689e01529ffb88a3fc7491b (patch) | |
tree | 487ab551a0fc567bd94672c4a7e06625cc8b99ec /indra/newview/skins/default/textures | |
parent | 7f085551431aa912a4a2be28e2b714d12f723809 (diff) | |
parent | 4ef75f35c195a4e2657a0e01d6b92cd40e6779f5 (diff) |
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
Diffstat (limited to 'indra/newview/skins/default/textures')
-rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 8 | ||||
-rw-r--r-- | indra/newview/skins/default/textures/windows/hint_arrow_down.png | bin | 0 -> 3239 bytes | |||
-rw-r--r-- | indra/newview/skins/default/textures/windows/hint_arrow_left.png | bin | 0 -> 3163 bytes | |||
-rw-r--r-- | indra/newview/skins/default/textures/windows/hint_arrow_right.png | bin | 0 -> 3155 bytes | |||
-rw-r--r-- | indra/newview/skins/default/textures/windows/hint_arrow_up.png | bin | 0 -> 3248 bytes | |||
-rw-r--r-- | indra/newview/skins/default/textures/windows/hint_background.png | bin | 0 -> 3930 bytes |
6 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 082b37d80b..9fbbfb1d2b 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -645,5 +645,11 @@ with the same filename but different name <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"/> - + + <texture name="hint_background" file_name="windows/hint_background.png" preload="false" scale.left="8" scale.top="70" scale.right="195" scale.bottom="11"/> + <texture name="hint_arrow_left" file_name="windows/hint_arrow_left.png" preload="false"/> + <texture name="hint_arrow_right" file_name="windows/hint_arrow_right.png" preload="false"/> + <texture name="hint_arrow_up" file_name="windows/hint_arrow_up.png" preload="false"/> + <texture name="hint_arrow_down" file_name="windows/hint_arrow_down.png" preload="false"/> + </textures> diff --git a/indra/newview/skins/default/textures/windows/hint_arrow_down.png b/indra/newview/skins/default/textures/windows/hint_arrow_down.png Binary files differnew file mode 100644 index 0000000000..11ab3c2d0c --- /dev/null +++ b/indra/newview/skins/default/textures/windows/hint_arrow_down.png diff --git a/indra/newview/skins/default/textures/windows/hint_arrow_left.png b/indra/newview/skins/default/textures/windows/hint_arrow_left.png Binary files differnew file mode 100644 index 0000000000..e5c597a550 --- /dev/null +++ b/indra/newview/skins/default/textures/windows/hint_arrow_left.png diff --git a/indra/newview/skins/default/textures/windows/hint_arrow_right.png b/indra/newview/skins/default/textures/windows/hint_arrow_right.png Binary files differnew file mode 100644 index 0000000000..3f89187e13 --- /dev/null +++ b/indra/newview/skins/default/textures/windows/hint_arrow_right.png diff --git a/indra/newview/skins/default/textures/windows/hint_arrow_up.png b/indra/newview/skins/default/textures/windows/hint_arrow_up.png Binary files differnew file mode 100644 index 0000000000..1050097efb --- /dev/null +++ b/indra/newview/skins/default/textures/windows/hint_arrow_up.png diff --git a/indra/newview/skins/default/textures/windows/hint_background.png b/indra/newview/skins/default/textures/windows/hint_background.png Binary files differnew file mode 100644 index 0000000000..0839a95205 --- /dev/null +++ b/indra/newview/skins/default/textures/windows/hint_background.png |