livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra/newview/skins/default/textures
History
James Cook ada0f4fa22 Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming. 
Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml

Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
 		2009-10-03 23:40:28 +00:00
..
bottomtray EXT-940 Add new art to viewer - 9/14/09 2009-09-14 18:41:40 +00:00
build EXT-1106 Add new art to viewer - 9/22/09 Added this week's art drop and referenced in textures.xml, EXT-1073 Add icon and style the L$ Balance button in top navigation bar 2009-09-22 17:31:39 +00:00
containers Merge xui-army-8 to pick up 2+ weeks of art, colors, and dialog layout changes. 2009-07-27 16:50:01 +00:00
icons Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming. 2009-10-03 23:40:28 +00:00
navbar EXT-1106 Add new art to viewer - 9/22/09 Added this week's art drop and referenced in textures.xml, EXT-1073 Add icon and style the L$ Balance button in top navigation bar 2009-09-22 17:31:39 +00:00
quick_tips merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1211 https://svn.aws.productengine.com/secondlife/pe/stable-1@1228 -> viewer-2.0.0-3 2009-08-03 22:25:48 +00:00
taskpanel EXT-1106 Add new art to viewer - 9/22/09 Added this week's art drop and referenced in textures.xml, EXT-1073 Add icon and style the L$ Balance button in top navigation bar 2009-09-22 17:31:39 +00:00
widgets EXT-332: Updated the visual style of the Buy L$ floater based on 2009-10-01 17:52:20 +00:00
windows DEV-35039 Viewer 2.0 Help System - Viewer Development 2009-09-30 17:46:31 +00:00
world svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 2009-08-04 01:12:59 +00:00
alpha_gradient.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
alpha_gradient_2d.j2c QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
arrow_down.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
arrow_up.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
badge_note.j2c QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
badge_ok.j2c QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
badge_warn.j2c QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
button_anim_pause.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
button_anim_pause_selected.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
button_anim_play.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
button_anim_play_selected.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
checkerboard_transparency_bg.png QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
circle.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
cloud-particle.j2c QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
color_swatch_alpha.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
crosshairs.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
default_land_picture.j2c svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge 2008-12-15 21:21:19 +00:00
default_profile_picture.j2c svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge 2008-12-15 21:21:19 +00:00
direction_arrow.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
down_arrow.png QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
eye_button_active.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
eye_button_inactive.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
ff_edit_mine.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
ff_edit_mine_button.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
ff_edit_theirs.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
ff_edit_theirs_button.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
ff_online_status_button.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
ff_visible_map.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
ff_visible_map_button.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
ff_visible_online.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
ff_visible_online_button.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
folder_arrow.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
foot_shadow.j2c QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
icn_label_web.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
icn_media.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
icn_media_movie.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
icn_media_web.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
icn_voice-groupfocus.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
icn_voice-localchat.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
icn_voice-pvtfocus.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
icon_avatar_offline.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
icon_avatar_online.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
icon_day_cycle.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
icon_diurnal.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
icon_event_adult.tga svn merge -r113004:115000 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 2009-03-20 20:00:47 +00:00
icon_for_sale_adult.tga svn merge -r113004:115000 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 2009-03-20 20:00:47 +00:00
icon_lock.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
icon_top_pick.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
image_edit_icon.tga merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@873 https://svn.aws.productengine.com/secondlife/pe/stable@888 -> viewer-2.0.0-pe-4 2009-07-02 00:38:13 +00:00
inv_folder_animation.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
jump_left_in.tga merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
jump_left_out.tga merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
jump_right_in.tga merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
jump_right_out.tga merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
lag_status_critical.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
lag_status_good.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
lag_status_warning.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
legend.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
locked_image.j2c svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge 2008-12-15 21:21:19 +00:00
map_avatar_8.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
map_avatar_16.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
map_avatar_above_8.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
map_avatar_below_8.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
map_event.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
map_event_adult.tga svn merge -r113004:115000 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 2009-03-20 20:00:47 +00:00
map_event_mature.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
map_home.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
map_infohub.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
map_telehub.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
map_track_8.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
map_track_16.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
menu_separator.png merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
missing_asset.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
mute_icon.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
notify_caution_icon.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
pixiesmall.j2c QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
places_rating_adult.tga merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1516 https://svn.aws.productengine.com/secondlife/pe/stable-2@1526 -> viewer-2.0.0-3 2009-09-02 02:59:07 +00:00
places_rating_mature.tga merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1516 https://svn.aws.productengine.com/secondlife/pe/stable-2@1526 -> viewer-2.0.0-3 2009-09-02 02:59:07 +00:00
places_rating_pg.tga merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1516 https://svn.aws.productengine.com/secondlife/pe/stable-2@1526 -> viewer-2.0.0-3 2009-09-02 02:59:07 +00:00
propertyline.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
rounded_square.j2c QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
script_error.j2c QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
show_btn.tga merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
show_btn_selected.tga merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
silhouette.j2c QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
slim_icon_16_viewer.tga svn merge -r 113014:113017 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge-QAR-1323 2009-02-27 21:01:19 +00:00
smicon_warn.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
spacer24.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
spacer35.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
square_btn_32x128.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
square_btn_selected_32x128.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
startup_logo.j2c QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
status_busy.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
tabarea.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
tearoff_pressed.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
tearoffbox.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
textures.xml Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming. 2009-10-03 23:40:28 +00:00
transparent.j2c merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
up_arrow.png QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
uv_test1.j2c QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
uv_test2.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
voice_meter_dot.j2c merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
voice_meter_rings.j2c merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
white.tga QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00