diff options
| author | Cinder Roxley <cinder.roxley@phoenixviewer.com> | 2013-06-27 21:22:44 -0600 |
|---|---|---|
| committer | Cinder Roxley <cinder.roxley@phoenixviewer.com> | 2013-06-27 21:22:44 -0600 |
| commit | 7e0bc07e5cd72cfb7c55c964a73d9d8c9e9e5988 (patch) | |
| tree | e847d23a8642323ef63df22a9426f1524d4da796 /indra/newview/skins/default/textures | |
| parent | 4f7b8a7e861ee25f1e0f7b0df2e9c8372254f46d (diff) | |
| parent | 6060e5e46acbeb20a301070a0fd0efea029d33d0 (diff) | |
Merged lindenlab/viewer-release into default
Diffstat (limited to 'indra/newview/skins/default/textures')
| -rw-r--r-- | indra/newview/skins/default/textures/flatnormal.tga | bin | 0 -> 92 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/materials_ui_x_24.png | bin | 0 -> 602 bytes | |||
| -rwxr-xr-x | indra/newview/skins/default/textures/textures.xml | 1 |
3 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/skins/default/textures/flatnormal.tga b/indra/newview/skins/default/textures/flatnormal.tga Binary files differnew file mode 100644 index 0000000000..6d5abd1782 --- /dev/null +++ b/indra/newview/skins/default/textures/flatnormal.tga diff --git a/indra/newview/skins/default/textures/materials_ui_x_24.png b/indra/newview/skins/default/textures/materials_ui_x_24.png Binary files differnew file mode 100644 index 0000000000..6d88554914 --- /dev/null +++ b/indra/newview/skins/default/textures/materials_ui_x_24.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index fcab966dee..b0e4b71d21 100755 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -743,6 +743,7 @@ with the same filename but different name <texture name="default_land_picture.j2c" /> <texture name="default_profile_picture.j2c" /> <texture name="locked_image.j2c" /> + <texture name="materials_ui_x_24.png" /> <texture name="Progress_1" file_name="icons/Progress_1.png" preload="true" /> <texture name="Progress_2" file_name="icons/Progress_2.png" preload="true" /> |
