QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release

merge Branch_1-20-14-Viewer-merge -> release
Includes Branch_1-20-Viewer-2 through 92456

1 files changed, 178 insertions, 176 deletions

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 12085ee77e..e65721e124 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -277,6 +277,7 @@ set(viewer_SOURCE_FILES
     llpanelpermissions.cpp
     llpanelpick.cpp
     llpanelplace.cpp
+    llpanelskins.cpp
     llpanelvolume.cpp
     llpanelweb.cpp
     llparcelselection.cpp
@@ -665,6 +666,7 @@ set(viewer_HEADER_FILES
     llpanelpermissions.h
     llpanelpick.h
     llpanelplace.h
+    llpanelskins.h
     llpanelvolume.h
     llpanelweb.h
     llparcelselection.h
@@ -1003,180 +1005,182 @@ endif (WINDOWS)
 # Add the xui files. This is handy for searching for xui elements
 # from within the IDE
 set(viewer_XUI_FILES
-    skins/xui/en-us/alerts.xml
-    skins/xui/en-us/floater_about_land.xml
-    skins/xui/en-us/floater_about.xml
-    skins/xui/en-us/floater_active_speakers.xml
-    skins/xui/en-us/floater_animation_preview.xml
-    skins/xui/en-us/floater_auction.xml
-    skins/xui/en-us/floater_audio_volume.xml
-    skins/xui/en-us/floater_avatar_picker.xml
-    skins/xui/en-us/floater_avatar_textures.xml
-    skins/xui/en-us/floater_build_options.xml
-    skins/xui/en-us/floater_bumps.xml
-    skins/xui/en-us/floater_buy_contents.xml
-    skins/xui/en-us/floater_buy_currency.xml
-    skins/xui/en-us/floater_buy_land.xml
-    skins/xui/en-us/floater_buy_object.xml
-    skins/xui/en-us/floater_camera.xml
-    skins/xui/en-us/floater_chat_history.xml
-    skins/xui/en-us/floater_chatterbox.xml
-    skins/xui/en-us/floater_choose_group.xml
-    skins/xui/en-us/floater_clothing.xml
-    skins/xui/en-us/floater_color_picker.xml
-    skins/xui/en-us/floater_critical.xml
-    skins/xui/en-us/floater_customize.xml
-    skins/xui/en-us/floater_day_cycle_options.xml
-    skins/xui/en-us/floater_device_settings.xml
-    skins/xui/en-us/floater_directory.xml
-    skins/xui/en-us/floater_env_settings.xml
-    skins/xui/en-us/floater_gesture.xml
-    skins/xui/en-us/floater_god_tools.xml
-    skins/xui/en-us/floater_group_info.xml
-    skins/xui/en-us/floater_hardware_settings.xml
-    skins/xui/en-us/floater_html.xml
-    skins/xui/en-us/floater_hud.xml
-    skins/xui/en-us/floater_image_preview.xml
-    skins/xui/en-us/floater_import.xml
-    skins/xui/en-us/floater_im.xml
-    skins/xui/en-us/floater_inspect.xml
-    skins/xui/en-us/floater_instant_message_ad_hoc.xml
-    skins/xui/en-us/floater_instant_message_group.xml
-    skins/xui/en-us/floater_instant_message.xml
-    skins/xui/en-us/floater_inventory_item_properties.xml
-    skins/xui/en-us/floater_inventory_view_finder.xml
-    skins/xui/en-us/floater_inventory.xml
-    skins/xui/en-us/floater_joystick.xml
-    skins/xui/en-us/floater_lagmeter.xml
-    skins/xui/en-us/floater_land_holdings.xml
-    skins/xui/en-us/floater_landmark_ctrl.xml
-    skins/xui/en-us/floater_live_lsleditor.xml
-    skins/xui/en-us/floater_lsl_guide.xml
-    skins/xui/en-us/floater_media_browser.xml
-    skins/xui/en-us/floater_moveview.xml
-    skins/xui/en-us/floater_mute_object.xml
-    skins/xui/en-us/floater_mute.xml
-    skins/xui/en-us/floater_my_friends.xml
-    skins/xui/en-us/floater_name_description.xml
-    skins/xui/en-us/floater_new_im.xml
-    skins/xui/en-us/floater_new_outfit_dialog.xml
-    skins/xui/en-us/floater_openobject.xml
-    skins/xui/en-us/floater_pay_object.xml
-    skins/xui/en-us/floater_pay.xml
-    skins/xui/en-us/floater_postcard.xml
-    skins/xui/en-us/floater_post_process.xml
-    skins/xui/en-us/floater_preferences.xml
-    skins/xui/en-us/floater_preview_animation.xml
-    skins/xui/en-us/floater_preview_classified.xml
-    skins/xui/en-us/floater_preview_embedded_texture.xml
-    skins/xui/en-us/floater_preview_event.xml
-    skins/xui/en-us/floater_preview_existing_landmark.xml
-    skins/xui/en-us/floater_preview_gesture.xml
-    skins/xui/en-us/floater_preview_notecard_keep_discard.xml
-    skins/xui/en-us/floater_preview_notecard.xml
-    skins/xui/en-us/floater_preview_sound.xml
-    skins/xui/en-us/floater_preview_texture_keep_discard.xml
-    skins/xui/en-us/floater_preview_texture.xml
-    skins/xui/en-us/floater_preview_url.xml
-    skins/xui/en-us/floater_price_for_listing.xml
-    skins/xui/en-us/floater_profile.xml
-    skins/xui/en-us/floater_region_info.xml
-    skins/xui/en-us/floater_report_abuse.xml
-    skins/xui/en-us/floater_report_bug.xml
-    skins/xui/en-us/floater_script_debug.xml
-    skins/xui/en-us/floater_script_ed_panel.xml
-    skins/xui/en-us/floater_script_preview.xml
-    skins/xui/en-us/floater_script_queue.xml
-    skins/xui/en-us/floater_script_search.xml
-    skins/xui/en-us/floater_select_key.xml
-    skins/xui/en-us/floater_sell_land.xml
-    skins/xui/en-us/floater_settings_debug.xml
-    skins/xui/en-us/floater_sim_release_message.xml
-    skins/xui/en-us/floater_snapshot.xml
-    skins/xui/en-us/floater_sound_preview.xml
-    skins/xui/en-us/floater_telehub.xml
-    skins/xui/en-us/floater_test.xml
-    skins/xui/en-us/floater_texture_ctrl.xml
-    skins/xui/en-us/floater_tools.xml
-    skins/xui/en-us/floater_top_objects.xml
-    skins/xui/en-us/floater_tos.xml
-    skins/xui/en-us/floater_url_entry.xml
-    skins/xui/en-us/floater_voice_wizard.xml
-    skins/xui/en-us/floater_water.xml
-    skins/xui/en-us/floater_wearable_save_as.xml
-    skins/xui/en-us/floater_windlight_options.xml
-    skins/xui/en-us/floater_world_map.xml
-    skins/xui/en-us/menu_inventory.xml
-    skins/xui/en-us/menu_login.xml
-    skins/xui/en-us/menu_pie_attachment.xml
-    skins/xui/en-us/menu_pie_avatar.xml
-    skins/xui/en-us/menu_pie_land.xml
-    skins/xui/en-us/menu_pie_object.xml
-    skins/xui/en-us/menu_pie_self.xml
-    skins/xui/en-us/menu_slurl.xml
-    skins/xui/en-us/menu_viewer.xml
-    skins/xui/en-us/mime_types.xml
-    skins/xui/en-us/notify.xml
-    skins/xui/en-us/panel_audio_device.xml
-    skins/xui/en-us/panel_audio.xml
-    skins/xui/en-us/panel_avatar_classified.xml
-    skins/xui/en-us/panel_avatar_pick.xml
-    skins/xui/en-us/panel_avatar.xml
-    skins/xui/en-us/panel_bars.xml
-    skins/xui/en-us/panel_bg_tab.xml
-    skins/xui/en-us/panel_bg_toolbar.xml
-    skins/xui/en-us/panel_chat_bar.xml
-    skins/xui/en-us/panel_classified.xml
-    skins/xui/en-us/panel_event.xml
-    skins/xui/en-us/panel_friends.xml
-    skins/xui/en-us/panel_group_finder.xml
-    skins/xui/en-us/panel_group_general.xml
-    skins/xui/en-us/panel_group_invite.xml
-    skins/xui/en-us/panel_group_land_money.xml
-    skins/xui/en-us/panel_group_notices.xml
-    skins/xui/en-us/panel_group_roles.xml
-    skins/xui/en-us/panel_groups.xml
-    skins/xui/en-us/panel_group_voting.xml
-    skins/xui/en-us/panel_group.xml
-    skins/xui/en-us/panel_land_covenant.xml
-    skins/xui/en-us/panel_login.xml
-    skins/xui/en-us/panel_master_volume.xml
-    skins/xui/en-us/panel_media_controls.xml
-    skins/xui/en-us/panel_media_remote_expanded.xml
-    skins/xui/en-us/panel_media_remote.xml
-    skins/xui/en-us/panel_overlaybar.xml
-    skins/xui/en-us/panel_place_small.xml
-    skins/xui/en-us/panel_place.xml
-    skins/xui/en-us/panel_preferences_audio.xml
-    skins/xui/en-us/panel_preferences_chat.xml
-    skins/xui/en-us/panel_preferences_general.xml
-    skins/xui/en-us/panel_preferences_graphics1.xml
-    skins/xui/en-us/panel_preferences_im.xml
-    skins/xui/en-us/panel_preferences_input.xml
-    skins/xui/en-us/panel_preferences_network.xml
-    skins/xui/en-us/panel_preferences_popups.xml
-    skins/xui/en-us/panel_preferences_voice.xml
-    skins/xui/en-us/panel_preferences_web.xml
-    skins/xui/en-us/panel_region_covenant.xml
-    skins/xui/en-us/panel_region_debug.xml
-    skins/xui/en-us/panel_region_estate.xml
-    skins/xui/en-us/panel_region_general.xml
-    skins/xui/en-us/panel_region_terrain.xml
-    skins/xui/en-us/panel_region_texture.xml
-    skins/xui/en-us/panel_scrolling_param.xml
-    skins/xui/en-us/panel_speaker_controls.xml
-    skins/xui/en-us/panel_status_bar.xml
-    skins/xui/en-us/panel_toolbar.xml
-    skins/xui/en-us/panel_top_pick.xml
-    skins/xui/en-us/panel_voice_controls.xml
-    skins/xui/en-us/panel_voice_enable.xml
-    skins/xui/en-us/panel_voice_options.xml
-    skins/xui/en-us/panel_voice_remote_expanded.xml
-    skins/xui/en-us/panel_voice_remote.xml
-    skins/xui/en-us/role_actions.xml
-    skins/xui/en-us/strings.xml
-    skins/xui/en-us/teleport_strings.xml
-    skins/xui/en-us/xui_version.xml
+    skins/default/colors.xml
+    skins/default/colors_base.xml
+    skins/default/xui/en-us/alerts.xml
+    skins/default/xui/en-us/floater_about_land.xml
+    skins/default/xui/en-us/floater_about.xml
+    skins/default/xui/en-us/floater_active_speakers.xml
+    skins/default/xui/en-us/floater_animation_preview.xml
+    skins/default/xui/en-us/floater_auction.xml
+    skins/default/xui/en-us/floater_audio_volume.xml
+    skins/default/xui/en-us/floater_avatar_picker.xml
+    skins/default/xui/en-us/floater_avatar_textures.xml
+    skins/default/xui/en-us/floater_build_options.xml
+    skins/default/xui/en-us/floater_bumps.xml
+    skins/default/xui/en-us/floater_buy_contents.xml
+    skins/default/xui/en-us/floater_buy_currency.xml
+    skins/default/xui/en-us/floater_buy_land.xml
+    skins/default/xui/en-us/floater_buy_object.xml
+    skins/default/xui/en-us/floater_camera.xml
+    skins/default/xui/en-us/floater_chat_history.xml
+    skins/default/xui/en-us/floater_chatterbox.xml
+    skins/default/xui/en-us/floater_choose_group.xml
+    skins/default/xui/en-us/floater_clothing.xml
+    skins/default/xui/en-us/floater_color_picker.xml
+    skins/default/xui/en-us/floater_critical.xml
+    skins/default/xui/en-us/floater_customize.xml
+    skins/default/xui/en-us/floater_day_cycle_options.xml
+    skins/default/xui/en-us/floater_device_settings.xml
+    skins/default/xui/en-us/floater_directory.xml
+    skins/default/xui/en-us/floater_env_settings.xml
+    skins/default/xui/en-us/floater_gesture.xml
+    skins/default/xui/en-us/floater_god_tools.xml
+    skins/default/xui/en-us/floater_group_info.xml
+    skins/default/xui/en-us/floater_hardware_settings.xml
+    skins/default/xui/en-us/floater_html.xml
+    skins/default/xui/en-us/floater_hud.xml
+    skins/default/xui/en-us/floater_image_preview.xml
+    skins/default/xui/en-us/floater_import.xml
+    skins/default/xui/en-us/floater_im.xml
+    skins/default/xui/en-us/floater_inspect.xml
+    skins/default/xui/en-us/floater_instant_message_ad_hoc.xml
+    skins/default/xui/en-us/floater_instant_message_group.xml
+    skins/default/xui/en-us/floater_instant_message.xml
+    skins/default/xui/en-us/floater_inventory_item_properties.xml
+    skins/default/xui/en-us/floater_inventory_view_finder.xml
+    skins/default/xui/en-us/floater_inventory.xml
+    skins/default/xui/en-us/floater_joystick.xml
+    skins/default/xui/en-us/floater_lagmeter.xml
+    skins/default/xui/en-us/floater_land_holdings.xml
+    skins/default/xui/en-us/floater_landmark_ctrl.xml
+    skins/default/xui/en-us/floater_live_lsleditor.xml
+    skins/default/xui/en-us/floater_lsl_guide.xml
+    skins/default/xui/en-us/floater_media_browser.xml
+    skins/default/xui/en-us/floater_moveview.xml
+    skins/default/xui/en-us/floater_mute_object.xml
+    skins/default/xui/en-us/floater_mute.xml
+    skins/default/xui/en-us/floater_my_friends.xml
+    skins/default/xui/en-us/floater_name_description.xml
+    skins/default/xui/en-us/floater_new_im.xml
+    skins/default/xui/en-us/floater_new_outfit_dialog.xml
+    skins/default/xui/en-us/floater_openobject.xml
+    skins/default/xui/en-us/floater_pay_object.xml
+    skins/default/xui/en-us/floater_pay.xml
+    skins/default/xui/en-us/floater_postcard.xml
+    skins/default/xui/en-us/floater_post_process.xml
+    skins/default/xui/en-us/floater_preferences.xml
+    skins/default/xui/en-us/floater_preview_animation.xml
+    skins/default/xui/en-us/floater_preview_classified.xml
+    skins/default/xui/en-us/floater_preview_embedded_texture.xml
+    skins/default/xui/en-us/floater_preview_event.xml
+    skins/default/xui/en-us/floater_preview_existing_landmark.xml
+    skins/default/xui/en-us/floater_preview_gesture.xml
+    skins/default/xui/en-us/floater_preview_notecard_keep_discard.xml
+    skins/default/xui/en-us/floater_preview_notecard.xml
+    skins/default/xui/en-us/floater_preview_sound.xml
+    skins/default/xui/en-us/floater_preview_texture_keep_discard.xml
+    skins/default/xui/en-us/floater_preview_texture.xml
+    skins/default/xui/en-us/floater_preview_url.xml
+    skins/default/xui/en-us/floater_price_for_listing.xml
+    skins/default/xui/en-us/floater_profile.xml
+    skins/default/xui/en-us/floater_region_info.xml
+    skins/default/xui/en-us/floater_report_abuse.xml
+    skins/default/xui/en-us/floater_report_bug.xml
+    skins/default/xui/en-us/floater_script_debug.xml
+    skins/default/xui/en-us/floater_script_ed_panel.xml
+    skins/default/xui/en-us/floater_script_preview.xml
+    skins/default/xui/en-us/floater_script_queue.xml
+    skins/default/xui/en-us/floater_script_search.xml
+    skins/default/xui/en-us/floater_select_key.xml
+    skins/default/xui/en-us/floater_sell_land.xml
+    skins/default/xui/en-us/floater_settings_debug.xml
+    skins/default/xui/en-us/floater_sim_release_message.xml
+    skins/default/xui/en-us/floater_snapshot.xml
+    skins/default/xui/en-us/floater_sound_preview.xml
+    skins/default/xui/en-us/floater_telehub.xml
+    skins/default/xui/en-us/floater_test.xml
+    skins/default/xui/en-us/floater_texture_ctrl.xml
+    skins/default/xui/en-us/floater_tools.xml
+    skins/default/xui/en-us/floater_top_objects.xml
+    skins/default/xui/en-us/floater_tos.xml
+    skins/default/xui/en-us/floater_url_entry.xml
+    skins/default/xui/en-us/floater_voice_wizard.xml
+    skins/default/xui/en-us/floater_water.xml
+    skins/default/xui/en-us/floater_wearable_save_as.xml
+    skins/default/xui/en-us/floater_windlight_options.xml
+    skins/default/xui/en-us/floater_world_map.xml
+    skins/default/xui/en-us/menu_inventory.xml
+    skins/default/xui/en-us/menu_login.xml
+    skins/default/xui/en-us/menu_pie_attachment.xml
+    skins/default/xui/en-us/menu_pie_avatar.xml
+    skins/default/xui/en-us/menu_pie_land.xml
+    skins/default/xui/en-us/menu_pie_object.xml
+    skins/default/xui/en-us/menu_pie_self.xml
+    skins/default/xui/en-us/menu_slurl.xml
+    skins/default/xui/en-us/menu_viewer.xml
+    skins/default/xui/en-us/mime_types.xml
+    skins/default/xui/en-us/notify.xml
+    skins/default/xui/en-us/panel_audio_device.xml
+    skins/default/xui/en-us/panel_audio.xml
+    skins/default/xui/en-us/panel_avatar_classified.xml
+    skins/default/xui/en-us/panel_avatar_pick.xml
+    skins/default/xui/en-us/panel_avatar.xml
+    skins/default/xui/en-us/panel_bars.xml
+    skins/default/xui/en-us/panel_bg_tab.xml
+    skins/default/xui/en-us/panel_bg_toolbar.xml
+    skins/default/xui/en-us/panel_chat_bar.xml
+    skins/default/xui/en-us/panel_classified.xml
+    skins/default/xui/en-us/panel_event.xml
+    skins/default/xui/en-us/panel_friends.xml
+    skins/default/xui/en-us/panel_group_finder.xml
+    skins/default/xui/en-us/panel_group_general.xml
+    skins/default/xui/en-us/panel_group_invite.xml
+    skins/default/xui/en-us/panel_group_land_money.xml
+    skins/default/xui/en-us/panel_group_notices.xml
+    skins/default/xui/en-us/panel_group_roles.xml
+    skins/default/xui/en-us/panel_groups.xml
+    skins/default/xui/en-us/panel_group_voting.xml
+    skins/default/xui/en-us/panel_group.xml
+    skins/default/xui/en-us/panel_land_covenant.xml
+    skins/default/xui/en-us/panel_login.xml
+    skins/default/xui/en-us/panel_master_volume.xml
+    skins/default/xui/en-us/panel_media_controls.xml
+    skins/default/xui/en-us/panel_media_remote_expanded.xml
+    skins/default/xui/en-us/panel_media_remote.xml
+    skins/default/xui/en-us/panel_overlaybar.xml
+    skins/default/xui/en-us/panel_place_small.xml
+    skins/default/xui/en-us/panel_place.xml
+    skins/default/xui/en-us/panel_preferences_audio.xml
+    skins/default/xui/en-us/panel_preferences_chat.xml
+    skins/default/xui/en-us/panel_preferences_general.xml
+    skins/default/xui/en-us/panel_preferences_graphics1.xml
+    skins/default/xui/en-us/panel_preferences_im.xml
+    skins/default/xui/en-us/panel_preferences_input.xml
+    skins/default/xui/en-us/panel_preferences_network.xml
+    skins/default/xui/en-us/panel_preferences_popups.xml
+    skins/default/xui/en-us/panel_preferences_voice.xml
+    skins/default/xui/en-us/panel_preferences_web.xml
+    skins/default/xui/en-us/panel_region_covenant.xml
+    skins/default/xui/en-us/panel_region_debug.xml
+    skins/default/xui/en-us/panel_region_estate.xml
+    skins/default/xui/en-us/panel_region_general.xml
+    skins/default/xui/en-us/panel_region_terrain.xml
+    skins/default/xui/en-us/panel_region_texture.xml
+    skins/default/xui/en-us/panel_scrolling_param.xml
+    skins/default/xui/en-us/panel_speaker_controls.xml
+    skins/default/xui/en-us/panel_status_bar.xml
+    skins/default/xui/en-us/panel_toolbar.xml
+    skins/default/xui/en-us/panel_top_pick.xml
+    skins/default/xui/en-us/panel_voice_controls.xml
+    skins/default/xui/en-us/panel_voice_enable.xml
+    skins/default/xui/en-us/panel_voice_options.xml
+    skins/default/xui/en-us/panel_voice_remote_expanded.xml
+    skins/default/xui/en-us/panel_voice_remote.xml
+    skins/default/xui/en-us/role_actions.xml
+    skins/default/xui/en-us/strings.xml
+    skins/default/xui/en-us/teleport_strings.xml
+    skins/default/xui/en-us/xui_version.xml
     )
 
 source_group("XUI Files" FILES ${viewer_XUI_FILES})
@@ -1189,8 +1193,6 @@ list(APPEND viewer_SOURCE_FILES ${viewer_XUI_FILES})
 set(viewer_APPSETTINGS_FILES
     app_settings/anim.ini
     app_settings/cmd_line.xml
-    app_settings/colors.xml
-    app_settings/colors_base.xml
     app_settings/grass.xml
     app_settings/high_graphics.xml
     app_settings/keys.ini