Manual merge.

By the way, removed "Add to outfit" and "Remove from outfit" buttons from the Edit Outfit panels.

--HG--
branch : product-engine

5 files changed, 60 insertions, 147 deletions

diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp
index fe93f45c89..daa41e1467 100644
--- a/indra/newview/llpaneloutfitedit.cpp
+++ b/indra/newview/llpaneloutfitedit.cpp
@@ -128,8 +128,6 @@ LLPanelOutfitEdit::LLPanelOutfitEdit()
 	mSearchFilter(NULL),
 	mCOFWearables(NULL),
 	mInventoryItemsPanel(NULL),
-	mAddToOutfitBtn(NULL),
-	mRemoveFromOutfitBtn(NULL),
 	mLookObserver(NULL)
 {
 	mSavedFolderState = new LLSaveFolderState();
@@ -216,13 +214,6 @@ BOOL LLPanelOutfitEdit::postBuild()
 	mAddToLookBtn->setEnabled(FALSE);
 	mAddToLookBtn->setVisible(FALSE); */
 	
-	childSetAction("add_to_outfit_btn", boost::bind(&LLPanelOutfitEdit::onAddToOutfitClicked, this));
-	childSetEnabled("add_to_outfit_btn", false);
-
-	mRemoveFromOutfitBtn = getChild<LLButton>("remove_from_outfit_btn");
-	mRemoveFromOutfitBtn->setEnabled(FALSE);
-	mRemoveFromOutfitBtn->setCommitCallback(boost::bind(&LLPanelOutfitEdit::onRemoveFromOutfitClicked, this));
-
 	mEditWearableBtn = getChild<LLButton>("edit_wearable_btn");
 	mEditWearableBtn->setEnabled(FALSE);
 	mEditWearableBtn->setVisible(FALSE);
@@ -383,8 +374,6 @@ void LLPanelOutfitEdit::onRemoveFromOutfitClicked(void)
 	LLAppearanceMgr::getInstance()->removeItemFromAvatar(id_to_remove);
 
 	updateLookInfo();
-
-	mRemoveFromOutfitBtn->setEnabled(FALSE);
 }
 
 
@@ -438,10 +427,7 @@ void LLPanelOutfitEdit::onInventorySelectionChange(const std::deque<LLFolderView
 	case LLAssetType::AT_CLOTHING:
 	case LLAssetType::AT_BODYPART:
 	case LLAssetType::AT_OBJECT:
-		childSetEnabled("add_to_outfit_btn", true);
-		break;
 	default:
-		childSetEnabled("add_to_outfit_btn", false);
 		break;
 	}
 	
@@ -474,10 +460,7 @@ void LLPanelOutfitEdit::onOutfitItemSelectionChange(void)
 	{
 	case LLAssetType::AT_CLOTHING:
 	case LLAssetType::AT_OBJECT:
-		mRemoveFromOutfitBtn->setEnabled(TRUE);
-		break;
 	default:
-		mRemoveFromOutfitBtn->setEnabled(FALSE);
 		break;
 	}
 }
diff --git a/indra/newview/llpaneloutfitedit.h b/indra/newview/llpaneloutfitedit.h
index 3d01303ee1..0074cd517b 100644
--- a/indra/newview/llpaneloutfitedit.h
+++ b/indra/newview/llpaneloutfitedit.h
@@ -122,8 +122,6 @@ private:
 	LLFilterEditor*		mSearchFilter;
 	LLSaveFolderState*	mSavedFolderState;
 	std::string			mSearchString;
-	LLButton*			mAddToOutfitBtn;
-	LLButton*			mRemoveFromOutfitBtn;
 	LLButton*			mEditWearableBtn;
 	LLToggleableMenu*	mSaveMenu;
 
diff --git a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
index e13847e412..86b9ea6e14 100644
--- a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
@@ -7,18 +7,18 @@
  height="200"
  left="0"
  name="cof_wearables"
- width="313">
+ width="311">
     <accordion
      follows="all"
      height="200"
      layout="topleft"
-     left="3"
+     left="0"
      single_expansion="true"
      top="0"
      name="cof_wearables_accordion"
      background_visible="true"
      bg_alpha_color="DkGray2"
-     width="307">
+     width="311">
         <accordion_tab
          layout="topleft"
          name="tab_attachments"
@@ -31,7 +31,7 @@
              left="0"
              name="list_attachments"
              top="0"
-             width="307" />
+             width="311" />
         </accordion_tab>
         <accordion_tab
          layout="topleft"
@@ -49,14 +49,14 @@
              left="0"
              name="button_bar_adaptor"
              top="0"
-             width="307">
+             width="311">
                 <panel
                  bevel="none"
                  filename="panel_clothing_list_button_bar.xml"
                  height="35"
                  name="button_bar"
                  top="0"
-                 width="307" />
+                 width="311" />
                 <flat_list_view
                  allow_select="true"
                  follows="all"
@@ -65,7 +65,7 @@
                  left="0"
                  name="list_clothing"
                  top_pad="0"
-                 width="307" />
+                 width="311" />
             </panel>
         </accordion_tab>
         <accordion_tab
@@ -84,14 +84,14 @@
              left="0"
              name="button_bar_adaptor"
              top="0"
-             width="307">
+             width="311">
                 <panel 
                  bevel="none"
                  filename="panel_bodyparts_list_button_bar.xml" 
                  height="35"
                  name="button_bar"
                  top="0"
-                 width="307"/>
+                 width="311"/>
                 <flat_list_view
                  allow_select="true"
                  follows="all"
@@ -100,7 +100,7 @@
                  left="0"
                  name="list_body_parts"
                  top_pad="0"
-                 width="307" />
+                 width="311" />
             </panel>
         </accordion_tab>
     </accordion>
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index 1da9304f03..6a212306d6 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -69,19 +69,21 @@
 
 <!-- "HEADER WITH ICON, STATUS TEXT AND OUTFIT NAME" -->
     <panel
+     background_visible="true"
+     bg_alpha_color="DkGray2"
      bevel_style="none"
      follows="top|left|right"
-     height="45"
+     height="40"
      label="bottom_panel"
      layout="topleft"
-     left="5"
+     left="6"
      name="header_panel"
      top_pad="5" 
-     width="300">
+     width="311">
         <icon
          follows="left|top"
          height="40"
-         image_name="t-shirt-image"
+         image_name="TabIcon_Appearance_Off"
          left="2"
          mouse_opaque="false"
          name="outfit_icon"
@@ -92,35 +94,35 @@
             <panel
              bevel_style="none"
              follows="top|right"
-             height="40"
+             height="38"
              label="bottom_panel"
              layout="topleft"
-             left_pad="10"
+             left_pad="5"
              name="outfit_name_and_status"
              top="2"
-             width="200">
+             width="270">
                 <text
                  follows="top|left|right"
-                 font="SansSerif"
+                 font="SansSerifSmallBold"
                  height="13"
                  layout="topleft"
                  name="status"
-                 text_color="Green"
-                 top="0"
-                 value="Editing..."
+                 text_color="EmphasisColor"
+                 top="2"
+                 value="Now editing..."
                  use_ellipses="true"
-                 width="275" /> 
+                 width="270" /> 
                 <text
                  follows="bottom|left|right"
-                 font="SansSerifHugeBold"
+                 font="SansSerifLargeBold"
                  height="26"
                  layout="topleft"
                  name="curr_outfit_name"
                  text_color="LtGray"
-                 top_pad="0"
+                 top_pad="2"
                  value="[Current Outfit]"
                  use_ellipses="true"
-                 width="275" /> 
+                 width="270" /> 
             </panel>
     </panel>
 
@@ -130,47 +132,49 @@
      animate="false"
      default_tab_group="2"
      follows="all"
-     height="450"
-     width="300"
+     height="495"
+     width="313"
      layout="topleft"
      orientation="vertical"
      name="im_panels"
      tab_group="1"
-     top_pad="10"
+     top_pad="5"
      left="5">
         <layout_panel
          layout="topleft"
-         height="225"
+         height="220"
          label="IM Control Panel"
          min_height="100"
          name="outfit_wearables_panel"
-         width="300"
+         width="313"
          auto_resize="true"
          user_resize="true">
 
             <!-- List containing items from the COF and Base outfit -->
             <panel
+             background_visible="false"
              class="cof_wearables"
              filename="panel_cof_wearables.xml"
              follows="left|top|right|bottom"
-             height="198"
+             height="193"
              layout="topleft"
-             left="0"
+             left="1"
              name="cof_wearables_list"
              top="0"
-             width="300" /> 
+             width="311" />
 
-            <panel
+          <!-- Button bar -->
+          <panel
              background_visible="true"
              bevel_style="none"
-             bottom="0"
              follows="bottom|left|right"
              height="27"
              label="bottom_panel"
-             layout="bottomleft"
+             layout="topleft"
              left="0"
              name="edit_panel"
-             width="300">
+             top="193"
+             width="313">
                 <button
                  follows="bottom|left"
                  height="25"
@@ -183,74 +187,14 @@
                  name="gear_menu_btn"
                  top="1"
                  width="31" />
-                <button
-                 follows="bottom|left"
-                 height="25"
-                 image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay=""
-                 image_selected="Toolbar_Middle_Selected"
-                 image_unselected="Toolbar_Middle_Off"
-                 layout="topleft"
-                 left_pad="1"
-                 name="add_btn"
-                 top="1"
-                 width="31" />
-                <button
-                 follows="bottom|left"
-                 height="25"
-                 image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay=""
-                 image_selected="Toolbar_Middle_Selected"
-                 image_unselected="Toolbar_Middle_Off"
-                 layout="topleft"
-                 left_pad="1"
-                 name="new_btn"
-                 top="1"
-                 width="31" />
-                <button
-                 follows="bottom|left"
-                 height="25"
-                 image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay=""
-                 image_selected="Toolbar_Middle_Selected"
-                 image_unselected="Toolbar_Middle_Off"
-                 layout="topleft"
-                 left_pad="1"
-                 name="move_closer_btn"
-                 top="1"
-                 width="31" />
-                <button
-                 follows="bottom|left"
-                 height="25"
-                 image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay=""
-                 image_selected="Toolbar_Middle_Selected"
-                 image_unselected="Toolbar_Middle_Off"
-                 layout="topleft"
-                 left_pad="1"
-                 name="move_further_btn"
-                 top="1"
-                 width="31" />
                 <icon
-                 follows="bottom|left"
+                 follows="bottom|left|right"
                  height="25"
-                 image_name="Toolbar_Middle_Off"
+                 image_name="Toolbar_Right_Off"
                  layout="topleft"
                  left_pad="1"
-                 name="dummy_icon"
-                 width="105" />
-                <button
-                 follows="bottom|right"
-                 height="25"
-                 image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="TrashItem_Off"
-                 image_selected="Toolbar_Middle_Selected"
-                 image_unselected="Toolbar_Middle_Off"
-                 layout="topleft"
-                 name="remove_from_outfit_btn"
-                 right="-1"
-                 top="1"
-                 width="31" />
+                 name="dummy_right_icon"
+                 width="281" />
             </panel>
         </layout_panel>
 
@@ -258,10 +202,10 @@
         <layout_panel
          auto_resize="true"
          default_tab_group="3"
-         height="225" 
-         min_height="225"
+         height="210" 
+         min_height="210"
          name="add_wearables_panel"
-         width="300"
+         width="313"
          tab_group="2"
          user_resize="true"
          visible="false">
@@ -445,22 +389,6 @@
                  name="add_to_outfit_btn"
                  top="1"
                  width="31" />
-                <icon
-                 follows="bottom|left"
-                 height="25"
-                 image_name="Toolbar_Middle_Off"
-                 layout="topleft"
-                 left_pad="1"
-                 name="dummy_middle_icon"
-                 width="140" />
-                <icon
-                 follows="bottom|left"
-                 height="25"
-                 image_name="Toolbar_Right_Off"
-                 layout="topleft"
-                 left_pad="1"
-                 name="dummy_right_icon"
-                 width="31" />
             </panel>
         </layout_panel>
     </layout_stack>
@@ -469,25 +397,28 @@
      follows="left|right|bottom"
      height="30"
      layout="topleft"
-     left="5"
-     top_pad="10"
+     left="4"
+     top_pad="2"
      name="save_revert_button_bar"
      width="300">
         <button
-         follows="bottom|left|right"
+         follows="bottom|left"
          height="23"
          label="Save"
          left="0"
          layout="topleft"
          name="save_btn"
-         width="145" />
+         top="0"
+         width="155" />
         <button
-         follows="bottom|right"
+         follows="bottom|left"
          height="23"
          name="save_flyout_btn"
          label=""
+         layout="topleft"
          left_pad="-20"
          tab_stop="false"
+         top="0"
          image_selected="SegmentedBtn_Right_Selected_Press"
          image_unselected="SegmentedBtn_Right_Off"
          image_pressed="SegmentedBtn_Right_Press"
@@ -497,10 +428,11 @@
         <button
          follows="bottom|left|right"
          height="23"
-         left_pad="15"
+         left_pad="12"
          label="Revert"
          layout="topleft"
          name="revert_btn"
-         width="145" />
+         top="0"
+         width="147" />
     </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index 73650a19dc..00b3328bde 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -106,7 +106,7 @@ width="333">
    <panel
    class="panel_outfit_edit"
    filename="panel_outfit_edit.xml"
-   height="550"
+   height="565"
    follows="all"
    layout="topleft"
    left="5"