Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/

8 files changed, 121 insertions, 120 deletions

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index ccf49f6a9f..309c2a5f30 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -143,12 +143,12 @@ with the same filename but different name
 
   <texture name="DownArrow" file_name="bottomtray/DownArrow.png" preload="false" />
 
-  <texture name="DropDown_Disabled" file_name="widgets/DropDown_Disabled.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
-  <texture name="DropDown_Over" file_name="widgets/DropDown_Over.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
-  <texture name="DropDown_Press" file_name="widgets/DropDown_Press.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
-  <texture name="DropDown_Selected" file_name="widgets/DropDown_Selected.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
-  <texture name="DropDown_On" file_name="widgets/DropDown_On.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
-  <texture name="DropDown_Off" file_name="widgets/DropDown_Off.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
+  <texture name="DropDown_Disabled" file_name="widgets/DropDown_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="99" scale.bottom="4" />
+  <texture name="DropDown_Over" file_name="widgets/DropDown_Over.png" preload="true" scale.left="4" scale.top="19" scale.right="99" scale.bottom="4" />
+  <texture name="DropDown_Press" file_name="widgets/DropDown_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="99" scale.bottom="4" />
+  <texture name="DropDown_Selected" file_name="widgets/DropDown_Selected.png" preload="true" scale.left="4" scale.top="19" scale.right="99" scale.bottom="4" />
+  <texture name="DropDown_On" file_name="widgets/DropDown_On.png" preload="true" scale.left="4" scale.top="19" scale.right="99" scale.bottom="4" />
+  <texture name="DropDown_Off" file_name="widgets/DropDown_Off.png" preload="true" scale.left="4" scale.top="19" scale.right="99" scale.bottom="4" />
 
   <texture name="DropTarget" file_name="widgets/DropTarget.png" preload="false" />
 
@@ -265,8 +265,8 @@ with the same filename but different name
   <texture name="Linden_Dollar_Alert" file_name="widgets/Linden_Dollar_Alert.png"/>
   <texture name="Linden_Dollar_Background" file_name="widgets/Linden_Dollar_Background.png"/>
 
-  <texture name="ListItem_Select" file_name="widgets/ListItem_Select.png" preload="true" />
-  <texture name="ListItem_Over" file_name="widgets/ListItem_Over.png" preload="true" />
+  <texture name="ListItem_Select" file_name="widgets/ListItem_Select.png" preload="true" scale.left="2" scale.bottom="2" scale.top="22" scale.right="278" />
+  <texture name="ListItem_Over" file_name="widgets/ListItem_Over.png" preload="true" scale.left="2" scale.bottom="2" scale.top="22" scale.right="278" />
 
   <texture name="Lock" file_name="icons/Lock.png" preload="false" />
   <texture name="Lock2" file_name="navbar/Lock.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/panel_classified_info.xml b/indra/newview/skins/default/xui/en/panel_classified_info.xml
index 31719aad20..34c1923582 100644
--- a/indra/newview/skins/default/xui/en/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml
@@ -29,7 +29,7 @@
      layout="topleft"
      name="back_btn"
      picture_style="true"
-     left="10"
+     left="11"
      tab_stop="false"
      top="2"
      width="23" />
@@ -40,7 +40,7 @@
      layout="topleft"
      left_pad="10"
      name="title"
-     text_color="white"
+     text_color="LtGray"
      top="0"
      value="Classified Info"
      use_ellipses="true"
@@ -49,13 +49,13 @@
      color="DkGray2"
      opaque="true"
      follows="all"
-     height="500"
+     height="502"
      layout="topleft"
-     left="10"
+     left="9"
      top_pad="10"
      name="profile_scroll"
      reserve_scroll_corner="false"
-     width="313">
+     width="310">
     <panel
      name="scroll_content_panel"
      follows="left|top"
@@ -65,16 +65,16 @@
      background_visible="false"
      height="500"
      left="0"
-     width="295">
+     width="285">
         <texture_picker
          enabled="false"
-         follows="left|top"
+         follows="left|top|right"
          height="197"
          layout="topleft"
-         left="10"
+         left="11"
          name="classified_snapshot"
-         top="20"
-         width="290" />
+         top="10"
+         width="286" />
         <text_editor
          allow_scroll="false"
          bg_visible="false"
@@ -181,37 +181,35 @@
     </scroll_container>
     <panel
      follows="left|right|bottom"
-     height="20"
+     height="35"
      layout="topleft"
-     top_pad="8"
-     left="10"
+     top_pad="5"
+     left="9"
      name="buttons">
         <button
          follows="bottom|left"
-         height="19"
+         height="23"
          label="Teleport"
          layout="topleft"
          left="0"
          name="teleport_btn"
          top="0"
-         width="90" />
+         width="101" />
         <button
          follows="bottom|left"
-         height="19"
+         height="23"
          label="Map"
          layout="topleft"
-         left_pad="10"
+         left_pad="3"
          name="show_on_map_btn"
-         top="0"
-         width="90" />
+         width="100" />
         <button
          follows="bottom|left"
-         height="19"
+         height="23"
          label="Edit"
          layout="topleft"
-         right="-1"
          name="edit_btn"
-         top="0"
-         width="90" />
+         left_pad="3"
+         width="101" />
     </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
index 9518151b72..1375eb87d9 100644
--- a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
@@ -76,6 +76,6 @@
      left_pad="5"
      right="-8"
      name="info_chevron"
-     top_delta="15"
+     top_delta="24"
      width="20" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_edit_classified.xml b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
index 188ded3dab..a357ba1d97 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
@@ -23,7 +23,7 @@
      layout="topleft"
      name="back_btn"
      picture_style="true"
-     left="10"
+     left="11"
      tab_stop="false"
      top="2"
      width="23" />
@@ -31,27 +31,27 @@
      type="string"
      length="1"
      follows="top"
-     font="SansSerifHuge"
-     height="15"
+     font="SansSerifHugeBold"
+     height="26"
      layout="topleft"
      left_pad="10"
      name="title"
-     text_color="white"
-     top="5"
+     text_color="LtGray"
+     top="0"
      width="250">
         Edit Classified
     </text>
    <scroll_container
      color="DkGray2"
      follows="all"
-     height="510"
+     height="502"
      layout="topleft"
-     left="10"
+     left="9"
      top_pad="10"
      name="profile_scroll"
      reserve_scroll_corner="false"
      opaque="true"
-     width="313">
+     width="310">
     <panel
      name="scroll_content_panel"
      follows="left|top"
@@ -65,10 +65,10 @@
     <texture_picker
      follows="left|top|right"
      height="197"
-     width="290"
+     width="286"
      layout="topleft"
-     top="20"
-     left="10"
+     top="10"
+     left="11"
      name="classified_snapshot" />
           <icon
            height="18"
@@ -78,7 +78,7 @@
            name="edit_icon"
            label=""
            tool_tip="Click to select an image"
-           top="27"
+           top="17"
            width="18" />
         <text
          type="string"
@@ -165,29 +165,29 @@
         </text>
         <button
          follows="left|top"
-         height="20"
+         height="23"
          label="Set to Current Location"
          layout="topleft"
-         left="8"
+         left="10"
          top_pad="5"
          name="set_to_curr_location_btn"
-         width="200" />
+         width="156" />
         <combo_box
          follows="left|top" 
-         height="18" 
+         height="23" 
          label=""
 	     left="10" 
          name="category" 
          top_pad="5"
-         width="200" />
+         width="156" />
         <combo_box 
          allow_text_entry="false" 
          follows="left|top" 
-         height="18" 
+         height="23" 
          left="10"
          name="content_type" 
          top_pad="5"
-         width="200">
+         width="156">
          <combo_item 
           name="mature_ci" 
           value="Mature">
@@ -203,10 +203,11 @@
          decimal_digits="0"
          follows="left|top"
          halign="left"
-         height="16"
+         height="23"
          increment="1"
          label_width="20"
          label="L$"
+         v_pad="10"
          layout="topleft"
          left="10"
          value="50"
@@ -228,30 +229,29 @@
     </scroll_container>
     <panel
      follows="left|right|bottom"
-     height="20"
+     height="23"
      label="bottom_panel"
      layout="topleft"
-     left="10"
+     left="9"
      name="bottom_panel"
      top_pad="5"
      width="303">
         <button
          follows="bottom|left"
-         height="19"
+         height="23"
          label="Save"
          layout="topleft"
          name="save_changes_btn"
          left="0"
          top="0"
-         width="130" />
+         width="152" />
         <button
          follows="bottom|left"
-         height="19"
+         height="23"
          label="Cancel"
          layout="topleft"
          name="cancel_btn"
-         left_pad="5"
-         right="-1"
-         width="130" />
+         left_pad="3"
+         width="152" />
     </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
index 8e39697a16..6ef762dc1d 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
@@ -18,7 +18,7 @@
      image_overlay="BackArrow_Off"
      layout="topleft"
      name="back_btn"
-     left="10"
+     left="11"
      tab_stop="false"
      top="2"
      width="23" />
@@ -26,26 +26,26 @@
      type="string"
      length="1"
      follows="top"
-     font="SansSerifHuge"
-     height="15"
+     font="SansSerifHugeBold"
+     height="26"
      layout="topleft"
      left_pad="10"
      name="title"
-     text_color="white"
-     top="5"
+     text_color="LtGray"
+     top="0"
      width="250">
         Edit Pick
     </text>
    <scroll_container
      color="DkGray2"
      follows="all"
-     height="500"
+     height="502"
      layout="topleft"
-     left="10"
+     left="9"
      top_pad="10"
      name="profile_scroll"
      opaque="true"
-     width="313">
+     width="310">
     <panel
      name="scroll_content_panel"
      follows="left|top|right"
@@ -59,11 +59,11 @@
     <texture_picker
      follows="left|top|right"
      height="197"
-     width="280"
+     width="272"
      layout="topleft"
      no_commit_on_selection="true"
-     top="20"
-     left="10"
+     top="10"
+     left="11"
      name="pick_snapshot" />
           <icon
            height="18"
@@ -73,7 +73,7 @@
            name="edit_icon"
            label=""
            tool_tip="Click to select an image"
-           top="27"
+           top="17"
            width="18" />
         <text
          type="string"
@@ -100,7 +100,7 @@
          max_length="63"
          name="pick_name"
          text_color="black"
-         width="280" />
+         width="273" />
         <text
          type="string"
          length="1"
@@ -119,7 +119,7 @@
         <text_editor
          follows="left|top|right"
          height="100"
-         width="280"
+         width="273"
          hide_scrollbar="false"
          layout="topleft"
          left="10"
@@ -158,41 +158,40 @@
         </text>
         <button
          follows="left|top"
-         height="20"
+         height="23"
          label="Set to Current Location"
          layout="topleft"
          left="8"
          top_pad="0"
          name="set_to_curr_location_btn"
-         width="200" />
+         width="156" />
     </panel>
     </scroll_container>
     <panel
      follows="left|right|bottom"
-     height="20"
+     height="23"
      label="bottom_panel"
      layout="topleft"
-     left="10"
+     left="9"
      name="bottom_panel"
      top_pad="5"
      width="303">
         <button
          follows="bottom|left"
-         height="19"
+         height="23"
          label="Save [WHAT]"
          layout="topleft"
          name="save_changes_btn"
          left="0"
          top="0"
-         width="130" />
+         width="152" />
         <button
          follows="bottom|left"
-         height="19"
+         height="23"
          label="Cancel"
          layout="topleft"
          name="cancel_btn"
-         left_pad="5"
-         right="-1"
-         width="130" />
+         left_pad="3"
+        width="152" />
     </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml
index 375f369ba7..097813131f 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml
@@ -16,7 +16,7 @@
      image_overlay="BackArrow_Off"
      layout="topleft"
      name="back_btn"
-     left="10"
+     left="11"
      tab_stop="false"
      top="2"
      width="23" />
@@ -27,7 +27,7 @@
      layout="topleft"
      left_pad="10"
      name="title"
-     text_color="white"
+     text_color="LtGray"
      top="0"
      value="Pick Info"
      use_ellipses="true"
@@ -36,12 +36,12 @@
      color="DkGray2"
      opaque="true"
      follows="all"
-     height="500"
+     height="502"
      layout="topleft"
-     left="10"
-     top_pad="5"
+     left="9"
+     top_pad="10"
      name="profile_scroll"
-     width="313">
+     width="310">
     <panel
      name="scroll_content_panel"
      follows="left|top|right"
@@ -57,10 +57,10 @@
          follows="left|top|right"
          height="197"
          layout="topleft"
-         left="10"
+         left="11"
          name="pick_snapshot"
-         top="20"
-         width="280" />
+         top="10"
+         width="272" />
         <text_editor
          allow_scroll="false"
          bg_visible="false"
@@ -115,8 +115,8 @@
      follows="left|right|bottom"
      height="35"
      layout="topleft"
-     top_pad="8"
-     left="10"
+     top_pad="5"
+     left="9"
      name="buttons">
         <button
          follows="bottom|left"
@@ -126,24 +126,22 @@
          left="0"
          name="teleport_btn"
          top="0"
-         width="90" />
+         width="101" />
         <button
          follows="bottom|left"
          height="23"
          label="Map"
          layout="topleft"
-         left_pad="10"
+         left_pad="3"
          name="show_on_map_btn"
-         top="0"
-         width="90" />
+         width="100" />
         <button
          follows="bottom|left"
          height="23"
          label="Edit"
          layout="topleft"
-         right="-1"
          name="edit_btn"
-         top="0"
-         width="90" />
+         left_pad="3"
+         width="101" />
     </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
index 9bcce1685e..8b25fb5d2a 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
@@ -76,6 +76,6 @@
      left_pad="5"
      right="-8"
      name="info_chevron"
-     top_delta="15"
+     top_delta="24"
      width="20" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index d31f4d039f..887a89d518 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
+bg_opaque_color="DkGray2"
+       background_visible="true"
+       background_opaque="true"
  follows="all"
  height="540"
  label="Picks"
@@ -70,13 +73,15 @@
     </accordion_tab>
  </accordion>
    <panel
-         background_visible="true"
+bg_opaque_color="DkGray2"
+       background_visible="true"
+       background_opaque="true"
          bevel_style="none"
          enabled="false"
          auto_resize="false"
          follows="bottom"
-         left="0"
-         height="18"
+         left="1"
+         height="27"
          label="bottom_panel"
          layout="topleft"
          name="edit_panel"
@@ -90,9 +95,9 @@
              image_unselected="OptionsMenu_Off"
               image_disabled="OptionsMenu_Disabled"
              layout="topleft"
-             left="0"
+             left="10"
              name="gear_menu_btn"
-             top="5"
+             top="9"
              width="18" />
             <button
              follows="bottom|left"
@@ -104,7 +109,7 @@
              left_pad="15"
              name="new_btn"
              tool_tip="Create a new pick or classified at the current location"
-             top="5"
+             top="9"
              width="18" />
             <button
              follows="bottom|right"
@@ -115,14 +120,17 @@
              layout="topleft"
              name="trash_btn"
              right="-10"
-             top="5"
+             top="9"
              width="18" />
         </panel>
         <panel
+ bg_opaque_color="DkGray"
+       background_visible="true"
+       background_opaque="true"
          layout="topleft"
          left="0"
          height="30"
-         top_pad="10"
+         top_pad="7"
          name="buttons_cucks"
          width="313">
        <button
@@ -131,35 +139,33 @@
          height="23"
          label="Info"
          layout="topleft"
-         left="5"
+         left="2"
          name="info_btn"
          tab_stop="false"
          tool_tip="Show pick information"
-         top="0"
-         width="55" />
+         top="5"
+         width="95" />
         <button
          enabled="false"
          follows="bottom|left"
          height="23"
          label="Teleport"
          layout="topleft"
-         left_pad="5"
+         left_pad="3"
          name="teleport_btn"
          tab_stop="false"
          tool_tip="Teleport to the corresponding area"
-         top="0"
-         width="77" />
+         width="117" />
         <button
          enabled="false"
          follows="bottom|left"
          height="23"
          label="Map"
          layout="topleft"
-         left_pad="5"
+         left_pad="3"
          name="show_on_map_btn"
          tab_stop="false"
          tool_tip="Show the corresponding area on the World Map"
-         top="0"
-         width="50" />
+         width="90" />
         </panel>
 </panel>