diff options
| author | Richard Linden <none@none> | 2010-08-26 12:34:56 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-08-26 12:34:56 -0700 |
| commit | 2667c77a1cfb230ade472a047f46fd2bde7883c0 (patch) | |
| tree | 3df1b9ad247685aaaf32369301e1da043fcbb2d3 /indra/newview/skins/default/textures | |
| parent | 74d4bbfa0a50df83a4fe419294609b6ef2af7a80 (diff) | |
| parent | ead46208b02f31c8ed06242a016501d57c90abfb (diff) | |
Automated merge with ssh://richard@hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/newview/skins/default/textures')
| -rw-r--r-- | indra/newview/skins/default/textures/icons/pop_up_caution.png | bin | 0 -> 3158 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/textures/windows/yellow_gradient.png | bin | 0 -> 3634 bytes |
3 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/skins/default/textures/icons/pop_up_caution.png b/indra/newview/skins/default/textures/icons/pop_up_caution.png Binary files differnew file mode 100644 index 0000000000..78b681cb33 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/pop_up_caution.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 9fbbfb1d2b..8d6a564687 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -652,4 +652,6 @@ with the same filename but different name <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"/> + <texture name="Yellow_Gradient" file_name="windows/yellow_gradient.png"/> + <texture name="Popup_Caution" file_name="icons/pop_up_caution.png"/> </textures> diff --git a/indra/newview/skins/default/textures/windows/yellow_gradient.png b/indra/newview/skins/default/textures/windows/yellow_gradient.png Binary files differnew file mode 100644 index 0000000000..5fd847aaef --- /dev/null +++ b/indra/newview/skins/default/textures/windows/yellow_gradient.png |
