diff options
author | Richard Nelson <richard@lindenlab.com> | 2011-10-05 13:01:57 -0700 |
---|---|---|
committer | Richard Nelson <richard@lindenlab.com> | 2011-10-05 13:01:57 -0700 |
commit | 7ffa6ba854392d5c37de8631c7f35edeed375a58 (patch) | |
tree | 8ca3d2ff39b8ec870ebdf264bf7a26a67f7df624 /indra/newview/skins/default/textures | |
parent | ba60e0906549840b8632d72f17b3f9bcda65e882 (diff) | |
parent | e61da057397f95e0dcf8bf964e2836d3d4a80c20 (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
Diffstat (limited to 'indra/newview/skins/default/textures')
-rw-r--r-- | indra/newview/skins/default/textures/green_checkmark.png | bin | 0 -> 414 bytes | |||
-rw-r--r-- | indra/newview/skins/default/textures/red_x.png | bin | 0 -> 624 bytes | |||
-rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 4 |
3 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/skins/default/textures/green_checkmark.png b/indra/newview/skins/default/textures/green_checkmark.png Binary files differnew file mode 100644 index 0000000000..d2a5b348dc --- /dev/null +++ b/indra/newview/skins/default/textures/green_checkmark.png diff --git a/indra/newview/skins/default/textures/red_x.png b/indra/newview/skins/default/textures/red_x.png Binary files differnew file mode 100644 index 0000000000..a61202f09b --- /dev/null +++ b/indra/newview/skins/default/textures/red_x.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 68773947ec..a98ef58f50 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -307,9 +307,9 @@ with the same filename but different name <texture name="menu_separator" file_name="navbar/FileMenu_Divider.png" scale.left="4" scale.top="166" scale.right="0" scale.bottom="0" /> - <texture name="ModelImport_Status_Good" file_name="lag_status_good.tga" preload="false"/> + <texture name="ModelImport_Status_Good" file_name="green_checkmark.png" preload="false"/> <texture name="ModelImport_Status_Warning" file_name="lag_status_warning.tga" preload="false"/> - <texture name="ModelImport_Status_Error" file_name="lag_status_critical.tga" preload="false"/> + <texture name="ModelImport_Status_Error" file_name="red_x.png" preload="false"/> <texture name="MouseLook_View_Off" file_name="bottomtray/MouseLook_view_off.png" preload="false" /> <texture name="MouseLook_View_On" file_name="bottomtray/MouseLook_view_on.png" preload="false" /> |