llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default.

2016-04-11 02:51:08 -05:00
parent d40256fb31
commit be5d2f20bc
1280 changed files with 2354 additions and 10692 deletions
--- a/indra/newview/skins/darkcatalan/textures/5748decc-f629-461c-9a36-a35a221fe21f.tga
+++ b/indra/newview/skins/darkcatalan/textures/5748decc-f629-461c-9a36-a35a221fe21f.tga
--- a/indra/newview/skins/darkcatalan/textures/account_id_green.tga
+++ b/indra/newview/skins/darkcatalan/textures/account_id_green.tga
--- a/indra/newview/skins/darkcatalan/textures/account_id_orange.tga
+++ b/indra/newview/skins/darkcatalan/textures/account_id_orange.tga
--- a/indra/newview/skins/darkcatalan/textures/active_speakers.tga
+++ b/indra/newview/skins/darkcatalan/textures/active_speakers.tga
--- a/indra/newview/skins/darkcatalan/textures/alpha_gradient.tga
+++ b/indra/newview/skins/darkcatalan/textures/alpha_gradient.tga
--- a/indra/newview/skins/darkcatalan/textures/avatar_gone.tga
+++ b/indra/newview/skins/darkcatalan/textures/avatar_gone.tga
--- a/indra/newview/skins/darkcatalan/textures/avatar_new.tga
+++ b/indra/newview/skins/darkcatalan/textures/avatar_new.tga
--- a/indra/newview/skins/darkcatalan/textures/checkerboard_transparency_bg.png
+++ b/indra/newview/skins/darkcatalan/textures/checkerboard_transparency_bg.png
--- a/indra/newview/skins/darkcatalan/textures/circle.tga
+++ b/indra/newview/skins/darkcatalan/textures/circle.tga
--- a/indra/newview/skins/darkcatalan/textures/close_in_blue.tga
+++ b/indra/newview/skins/darkcatalan/textures/close_in_blue.tga
--- a/indra/newview/skins/darkcatalan/textures/close_inactive_blue.tga
+++ b/indra/newview/skins/darkcatalan/textures/close_inactive_blue.tga
--- a/indra/newview/skins/darkcatalan/textures/closebox.tga
+++ b/indra/newview/skins/darkcatalan/textures/closebox.tga
--- a/indra/newview/skins/darkcatalan/textures/color_swatch_alpha.tga
+++ b/indra/newview/skins/darkcatalan/textures/color_swatch_alpha.tga
--- a/indra/newview/skins/darkcatalan/textures/combobox_arrow.tga
+++ b/indra/newview/skins/darkcatalan/textures/combobox_arrow.tga
--- a/indra/newview/skins/darkcatalan/textures/crosshairs.tga
+++ b/indra/newview/skins/darkcatalan/textures/crosshairs.tga
--- a/indra/newview/skins/darkcatalan/textures/darkgray.tga
+++ b/indra/newview/skins/darkcatalan/textures/darkgray.tga
--- a/indra/newview/skins/darkcatalan/textures/down_arrow.png
+++ b/indra/newview/skins/darkcatalan/textures/down_arrow.png
--- a/indra/newview/skins/darkcatalan/textures/folder_arrow.tga
+++ b/indra/newview/skins/darkcatalan/textures/folder_arrow.tga
--- a/indra/newview/skins/darkcatalan/textures/icn_active-speakers-dot-lvl0.tga
+++ b/indra/newview/skins/darkcatalan/textures/icn_active-speakers-dot-lvl0.tga
--- a/indra/newview/skins/darkcatalan/textures/icn_active-speakers-dot-lvl1.tga
+++ b/indra/newview/skins/darkcatalan/textures/icn_active-speakers-dot-lvl1.tga
--- a/indra/newview/skins/darkcatalan/textures/icn_active-speakers-dot-lvl2.tga
+++ b/indra/newview/skins/darkcatalan/textures/icn_active-speakers-dot-lvl2.tga
--- a/indra/newview/skins/darkcatalan/textures/icn_active-speakers-typing1.tga
+++ b/indra/newview/skins/darkcatalan/textures/icn_active-speakers-typing1.tga
--- a/indra/newview/skins/darkcatalan/textures/icn_active-speakers-typing2.tga
+++ b/indra/newview/skins/darkcatalan/textures/icn_active-speakers-typing2.tga
--- a/indra/newview/skins/darkcatalan/textures/icn_active-speakers-typing3.tga
+++ b/indra/newview/skins/darkcatalan/textures/icn_active-speakers-typing3.tga
--- a/indra/newview/skins/darkcatalan/textures/icn_clear_lineeditor.tga
+++ b/indra/newview/skins/darkcatalan/textures/icn_clear_lineeditor.tga
--- a/indra/newview/skins/darkcatalan/textures/icn_rounded-text-field.tga
+++ b/indra/newview/skins/darkcatalan/textures/icn_rounded-text-field.tga
--- a/indra/newview/skins/darkcatalan/textures/icn_scrollbar.tga
+++ b/indra/newview/skins/darkcatalan/textures/icn_scrollbar.tga
--- a/indra/newview/skins/darkcatalan/textures/icn_scrollbar_bg.tga
+++ b/indra/newview/skins/darkcatalan/textures/icn_scrollbar_bg.tga
--- a/indra/newview/skins/darkcatalan/textures/icn_scrollbar_thumb.tga
+++ b/indra/newview/skins/darkcatalan/textures/icn_scrollbar_thumb.tga
--- a/indra/newview/skins/darkcatalan/textures/icn_speaker-muted_dark.tga
+++ b/indra/newview/skins/darkcatalan/textures/icn_speaker-muted_dark.tga
--- a/indra/newview/skins/darkcatalan/textures/icn_textfield_enabled.tga
+++ b/indra/newview/skins/darkcatalan/textures/icn_textfield_enabled.tga
--- a/indra/newview/skins/darkcatalan/textures/icn_voice-call-end.tga
+++ b/indra/newview/skins/darkcatalan/textures/icn_voice-call-end.tga
--- a/indra/newview/skins/darkcatalan/textures/icn_voice-call-start.tga
+++ b/indra/newview/skins/darkcatalan/textures/icn_voice-call-start.tga
--- a/indra/newview/skins/darkcatalan/textures/icn_voice-groupfocus.tga
+++ b/indra/newview/skins/darkcatalan/textures/icn_voice-groupfocus.tga
--- a/indra/newview/skins/darkcatalan/textures/icn_voice-pvtfocus.tga
+++ b/indra/newview/skins/darkcatalan/textures/icn_voice-pvtfocus.tga
--- a/indra/newview/skins/darkcatalan/textures/icn_voice_ptt-on-lvl1.tga
+++ b/indra/newview/skins/darkcatalan/textures/icn_voice_ptt-on-lvl1.tga
--- a/indra/newview/skins/darkcatalan/textures/icn_voice_ptt-on-lvl2.tga
+++ b/indra/newview/skins/darkcatalan/textures/icn_voice_ptt-on-lvl2.tga
--- a/indra/newview/skins/darkcatalan/textures/icn_voice_ptt-on-lvl3.tga
+++ b/indra/newview/skins/darkcatalan/textures/icn_voice_ptt-on-lvl3.tga
--- a/indra/newview/skins/darkcatalan/textures/icn_voice_ptt-on.tga
+++ b/indra/newview/skins/darkcatalan/textures/icn_voice_ptt-on.tga
--- a/indra/newview/skins/darkcatalan/textures/icon_auction.tga
+++ b/indra/newview/skins/darkcatalan/textures/icon_auction.tga
--- a/indra/newview/skins/darkcatalan/textures/icon_day_cycle.tga
+++ b/indra/newview/skins/darkcatalan/textures/icon_day_cycle.tga
--- a/indra/newview/skins/darkcatalan/textures/icon_diurnal.tga
+++ b/indra/newview/skins/darkcatalan/textures/icon_diurnal.tga
--- a/indra/newview/skins/darkcatalan/textures/icon_event.tga
+++ b/indra/newview/skins/darkcatalan/textures/icon_event.tga
--- a/indra/newview/skins/darkcatalan/textures/icon_event_mature.tga
+++ b/indra/newview/skins/darkcatalan/textures/icon_event_mature.tga
--- a/indra/newview/skins/darkcatalan/textures/icon_for_sale.tga
+++ b/indra/newview/skins/darkcatalan/textures/icon_for_sale.tga
--- a/indra/newview/skins/darkcatalan/textures/icon_group.tga
+++ b/indra/newview/skins/darkcatalan/textures/icon_group.tga
--- a/indra/newview/skins/darkcatalan/textures/icon_groupnotice.tga
+++ b/indra/newview/skins/darkcatalan/textures/icon_groupnotice.tga
--- a/indra/newview/skins/darkcatalan/textures/icon_groupnoticeinventory.tga
+++ b/indra/newview/skins/darkcatalan/textures/icon_groupnoticeinventory.tga
--- a/indra/newview/skins/darkcatalan/textures/icon_lock.tga
+++ b/indra/newview/skins/darkcatalan/textures/icon_lock.tga
--- a/indra/newview/skins/darkcatalan/textures/icon_place.tga
+++ b/indra/newview/skins/darkcatalan/textures/icon_place.tga
--- a/indra/newview/skins/darkcatalan/textures/icon_popular.tga
+++ b/indra/newview/skins/darkcatalan/textures/icon_popular.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_folder_animation.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_folder_animation.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_folder_bodypart.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_folder_bodypart.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_folder_callingcard.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_folder_callingcard.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_folder_clothing.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_folder_clothing.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_folder_gesture.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_folder_gesture.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_folder_landmark.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_folder_landmark.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_folder_lostandfound.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_folder_lostandfound.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_folder_notecard.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_folder_notecard.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_folder_object.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_folder_object.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_folder_plain_closed.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_folder_plain_closed.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_folder_plain_open.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_folder_plain_open.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_folder_script.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_folder_script.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_folder_snapshot.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_folder_snapshot.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_folder_sound.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_folder_sound.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_folder_texture.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_folder_texture.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_folder_trash.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_folder_trash.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_item_animation.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_item_animation.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_item_attach.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_item_attach.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_item_callingcard_offline.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_item_callingcard_offline.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_item_callingcard_online.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_item_callingcard_online.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_item_clothing.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_item_clothing.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_item_eyes.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_item_eyes.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_item_gesture.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_item_gesture.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_item_gloves.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_item_gloves.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_item_hair.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_item_hair.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_item_jacket.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_item_jacket.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_item_landmark.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_item_landmark.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_item_landmark_visited.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_item_landmark_visited.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_item_notecard.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_item_notecard.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_item_object.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_item_object.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_item_object_multi.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_item_object_multi.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_item_pants.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_item_pants.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_item_script.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_item_script.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_item_script_dangerous.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_item_script_dangerous.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_item_shape.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_item_shape.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_item_shirt.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_item_shirt.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_item_shoes.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_item_shoes.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_item_skin.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_item_skin.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_item_skirt.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_item_skirt.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_item_snapshot.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_item_snapshot.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_item_socks.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_item_socks.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_item_sound.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_item_sound.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_item_texture.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_item_texture.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_item_underpants.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_item_underpants.tga
--- a/indra/newview/skins/darkcatalan/textures/inv_item_undershirt.tga
+++ b/indra/newview/skins/darkcatalan/textures/inv_item_undershirt.tga
--- a/indra/newview/skins/darkcatalan/textures/lag_status_critical.tga
+++ b/indra/newview/skins/darkcatalan/textures/lag_status_critical.tga
--- a/indra/newview/skins/darkcatalan/textures/lag_status_good.tga
+++ b/indra/newview/skins/darkcatalan/textures/lag_status_good.tga
--- a/indra/newview/skins/darkcatalan/textures/lag_status_warning.tga
+++ b/indra/newview/skins/darkcatalan/textures/lag_status_warning.tga
--- a/indra/newview/skins/darkcatalan/textures/legend.tga
+++ b/indra/newview/skins/darkcatalan/textures/legend.tga
--- a/Show More
+++ b/Show More