Automated merge with ssh://hg.lindenlab.com/james/gooey

indra/newview/skins/default/textures/textures.xml

@@ -170,6 +170,7 @@ with the same filename but different name
   <texture name="ForwardArrow_Press" file_name="icons/ForwardArrow_Press.png" preload="false" />
 
   <texture name="Generic_Group" file_name="icons/Generic_Group.png" preload="false" />
+  <texture name="icon_group.tga" file_name="icons/Generic_Group.png" preload="false" />
   <texture name="Generic_Group_Large" file_name="icons/Generic_Group_Large.png" preload="false" />
   <texture name="Generic_Object_Medium" file_name="icons/Generic_Object_Medium.png" preload="false" />
   <texture name="Generic_Object_Small" file_name="icons/Generic_Object_Small.png" preload="false" />
@@ -312,6 +313,9 @@ with the same filename but different name
 
   <texture name="Notices_Unread" file_name="bottomtray/Notices_Unread.png" preload="true" />
 
+  <texture name="NoEntryLines" file_name="world/NoEntryLines.png" use_mips="true" preload="false" />
+  <texture name="NoEntryPassLines" file_name="world/NoEntryPassLines.png" use_mips="true" preload="false" />
+
   <texture name="Object_Cone" file_name="build/Object_Cone.png" preload="false" />
   <texture name="Object_Cube" file_name="build/Object_Cube.png" preload="false" />
   <texture name="Object_Cylinder" file_name="build/Object_Cylinder.png" preload="false" />
@@ -551,8 +555,8 @@ with the same filename but different name
   <texture name="TabTop_Right_Selected" file_name="containers/TabTop_Right_Selected.png" preload="false" />
   <texture name="TabTop_Middle_Off" file_name="containers/TabTop_Middle_Off.png" preload="false" scale.left="8" scale.top="8" scale.right="120" scale.bottom="9" />
   <texture name="TabTop_Middle_Selected" file_name="containers/TabTop_Middle_Selected.png" preload="false" scale.left="8" scale.top="8" scale.right="96" scale.bottom="9" />
-  <texture name="TabTop_Left_Off" file_name="containers/TabTop_Left_Off.png"	preload="false" scale.left="8" scale.top="8" scale.right="120" scale.bottom="9" />
-  <texture name="TabTop_Left_Selected" file_name="containers/TabTop_Left_Selected.png"	preload="false" scale.left="8" scale.top="8" scale.right="96" scale.bottom="9" />
+  <texture name="TabTop_Left_Off" file_name="containers/TabTop_Left_Off.png" preload="false" scale.left="8" scale.top="8" scale.right="120" scale.bottom="9" />
+  <texture name="TabTop_Left_Selected" file_name="containers/TabTop_Left_Selected.png" preload="false" scale.left="8" scale.top="8" scale.right="96" scale.bottom="9" />
 
   <texture name="TaskPanel_Tab_Off" file_name="taskpanel/TaskPanel_Tab_Off.png" preload="false" scale.left="4" scale.top="29" scale.right="36" scale.bottom="4" />
   <texture name="TaskPanel_Tab_Selected" file_name="taskpanel/TaskPanel_Tab_Selected.png" preload="false" scale.left="5" scale.top="30" scale.right="36" scale.bottom="5" />
@@ -637,28 +641,12 @@ with the same filename but different name
   <texture name="PowerOff_Over" file_name="icons/PowerOff_Over.png" preload="false" />
   <texture name="PowerOff_Press" file_name="icons/PowerOff_Press.png" preload="false" />
 
-  <!--WARNING OLD ART *do not use*-->
-
-  <texture name="btn_chatbar.tga" scale.left="20" scale.top="24" scale.right="44" scale.bottom="0" />
-  <texture name="btn_chatbar_selected.tga" scale.left="20" scale.top="24" scale.right="44" scale.bottom="0" />
-
-  <texture name="cam_rotate_out.tga" preload="false" />
-  <texture name="cam_rotate_in.tga" preload="false" />
-  <texture name="cam_zoom_out.tga" preload="false" />
-  <texture name="cam_zoom_plus_in.tga" preload="false" />
-  <texture name="cam_zoom_minus_in.tga" preload="false" />
-
+  <!--WARNING OLD ART BELOW *do not use*-->
   <texture name="icn_chatbar.tga" />
-  <texture name="icn_media-pause.tga" />
-  <texture name="icn_media-play.tga" />
-  <texture name="icn_music-play.tga" />
-  <texture name="icn_music-pause.tga" />
   <texture name="icn_media_web.tga" preload="true" />
   <texture name="icn_media_movie.tga" preload="true" />
-
   <texture name="icn_speaker-muted_dark.tga" />
   <texture name="icn_speaker_dark.tga" />
-
   <texture name="icn_voice-localchat.tga" />
   <texture name="icn_voice-groupfocus.tga" />
   <texture name="icn_voice-pvtfocus.tga" />
@@ -668,67 +656,30 @@ with the same filename but different name
   <texture name="jump_right_out.tga" />
   <texture name="jump_right_in.tga" />
 
-  <texture name="move_forward_out.tga" preload="false" />
-  <texture name="move_forward_in.tga" preload="false" />
-  <texture name="move_left_out.tga" preload="false" />
-  <texture name="move_left_in.tga" preload="false" />
-  <texture name="move_turn_left_out.tga" preload="false" />
-  <texture name="move_turn_left_in.tga" preload="false" />
-  <texture name="move_turn_right_out.tga" preload="false" />
-  <texture name="move_turn_right_in.tga" preload="false" />
-  <texture name="move_right_out.tga" preload="false" />
-  <texture name="move_right_in.tga" preload="false" />
-  <texture name="move_up_in.tga" preload="false" />
-  <texture name="move_up_out.tga" preload="false" />
-  <texture name="move_down_in.tga" preload="false" />
-  <texture name="move_down_out.tga" preload="false" />
-
   <texture name="up_arrow.tga" file_name="up_arrow.png" />
   <texture name="down_arrow.tga" file_name="down_arrow.png" />
+  <texture name="arrow_down.tga" />
 
   <texture name="tearoffbox.tga" />
   <texture name="tearoff_pressed.tga" />
 
   <texture name="icn_label_music.tga" />
   <texture name="icn_label_media.tga" />
-  <texture name="arrow_down.tga" />
-  <texture name="cloud-particle.j2c" use_mips="true" />
-
-  <texture name="skin_thumbnail_default.png" preload="false" />
-
-  <texture name="icn_textfield_enabled.tga" scale.left="5" scale.top="5" scale.bottom="5" scale.right="5" />
   <texture name="icn_rounded-text-field.tga" scale.left="14" scale.bottom="16" scale.top="16" scale.right="114" />
 
-  <texture name="toolbar_btn_enabled.tga" scale.left="7" scale.top="32" scale.right="121" scale.bottom="0" />
-  <texture name="toolbar_btn_disabled.tga" scale.left="7" scale.top="32" scale.right="121" scale.bottom="0" />
-  <texture name="toolbar_btn_selected.tga" scale.left="7" scale.top="32" scale.right="121" scale.bottom="0" />
-
   <texture name="toggle_button_off" file_name="toggle_button_off.png" preload="true" />
   <texture name="toggle_button_selected" file_name="toggle_button_selected.png" preload="true" />
 
   <texture name="sm_rounded_corners_simple.tga" scale.left="4" scale.top="4" scale.bottom="4" scale.right="4" />
-
   <texture name="rounded_square.tga"	file_name="rounded_square.j2c" preload="true" scale.left="16" scale.top="16" scale.right="112" scale.bottom="16" />
-
-  <texture name="rounded_square_soft.tga"	file_name="rounded_square_soft.j2c" preload="true" scale.left="16" scale.top="16" scale.right="112" scale.bottom="16" />
-
-  <texture name="toolbar_tab.tga"	preload="true" scale.left="6" scale.top="42" scale.right="104" scale.bottom="8" />
-  <texture name="toolbar_bg.tga"	preload="true" scale.left="6" scale.top="42" scale.right="96" scale.bottom="16" />
-
-  <texture name="tab_top_blue.tga"	preload="false" scale.left="8" scale.top="8" scale.right="120" scale.bottom="9" />
-  <texture name="tab_top_selected_blue.tga" preload="false" scale.left="8" scale.top="8" scale.right="96" scale.bottom="9" />
-
   <texture name="color_swatch_alpha.tga" preload="true" />
 
   <texture name="button_anim_pause.tga" />
   <texture name="button_anim_pause_selected.tga" />
   <texture name="button_anim_play.tga" />
   <texture name="button_anim_play_selected.tga" />
-  <texture name="button_anim_stop.tga" />
-  <texture name="button_anim_stop_selected.tga" />
   <texture name="crosshairs.tga" />
   <texture name="direction_arrow.tga" />
-  <texture name="foot_shadow.j2c" use_mips="true" />
 
   <texture name="icon_auction.tga" />
   <texture name="icon_avatar_offline.tga" />
@@ -738,10 +689,6 @@ with the same filename but different name
   <texture name="icon_event.tga" />
   <texture name="icon_event_mature.tga" />
   <texture name="icon_for_sale.tga" />
-  <texture name="icon_group.tga" />
-  <texture name="icon_groupnotice.tga" />
-  <texture name="icon_groupnoticeinventory.tga" />
-  <texture name="icon_place.tga" />
   <texture name="icon_place_for_sale.tga" />
   <texture name="icon_popular.tga" />
   <texture name="icon_top_pick.tga" />
@@ -764,8 +711,6 @@ with the same filename but different name
 
   <texture name="media_icon.tga" file_name="icn_label_media.tga" />
   <texture name="music_icon.tga" file_name="icn_label_music.tga" />
-  <texture name="NoEntryLines" file_name="world/NoEntryLines.png" use_mips="true" preload="false" />
-  <texture name="NoEntryPassLines" file_name="world/NoEntryPassLines.png" use_mips="true" preload="false" />
 
   <texture name="notify_tip_icon.tga" />
   <texture name="notify_caution_icon.tga" />
@@ -775,13 +720,11 @@ with the same filename but different name
   <texture name="pixiesmall.j2c" use_mips="true" />
   <texture name="script_error.j2c" use_mips="true" />
   <texture name="silhouette.j2c" use_mips="true" />
+  <texture name="foot_shadow.j2c" use_mips="true" />
+  <texture name="cloud-particle.j2c" use_mips="true" />
 
   <texture name="status_no_build.tga" />
   <texture name="status_voice.tga" />
-  <texture name="status_buy_currency.tga" />
-  <texture name="status_buy_currency_pressed.tga" />
-  <texture name="status_buy_land.tga" />
-  <texture name="status_buy_land_pressed.tga" />
   <texture name="status_no_fly.tga" />
   <texture name="status_health.tga" />
   <texture name="status_no_push.tga" />
@@ -808,23 +751,5 @@ with the same filename but different name
   <texture name="default_profile_picture.j2c" />
   <texture name="locked_image.j2c" />
 
-  <texture name="media_btn_back.png" />
-  <texture name="media_btn_done.png" />
-  <texture name="media_btn_forward.png" />
-  <texture name="media_btn_home.png" />
-  <texture name="media_btn_newwindow.png" />
-  <texture name="media_btn_optimalzoom.png" />
-  <texture name="media_btn_reload.png" />
-  <texture name="media_btn_scrolldown.png" />
-  <texture name="media_btn_scrollleft.png" />
-  <texture name="media_btn_scrollright.png" />
-  <texture name="media_btn_scrollup.png" />
-  <texture name="media_btn_stoploading.png" />
-  <texture name="media_panel_divider.png" />
-
   <texture name="media_floater_border_16.png" scale_top="12" scale_left="4" scale_bottom="4" scale_right="12" />
-
-  <texture name="media_panel_bg.png" preload="true" scale_left="9" scale_top="9" scale_right="9" scale_bottom="9" />
-  <texture name="media_panel_hoverrectangle.png" preload="true" scale_left="9" scale_top="9" scale_right="9" scale_bottom="9" />
-
 </textures>

indra/newview/skins/default/xui/en/panel_landmark_info.xml

@@ -229,7 +229,6 @@
                  value="Title:"
                  width="290" />
                 <line_editor
-                 background_image_disabled="task_panel_background.png"
                  follows="left|top|right"
                  height="22"
                  layout="topleft"