Skip to content
Snippets Groups Projects
Commit 9fda4623 authored by Vadim Savchuk's avatar Vadim Savchuk
Browse files

Manual merge. 

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

--HG--
branch : product-engine
parents 23bd34a7 66e407c1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/newview/llpaneloutfitedit.cpp
+ 0
− 17
View file @ 9fda4623
...@@ -128,8 +128,6 @@ LLPanelOutfitEdit::LLPanelOutfitEdit() ...@@ -128,8 +128,6 @@ LLPanelOutfitEdit::LLPanelOutfitEdit()
mSearchFilter(NULL), mSearchFilter(NULL),
mCOFWearables(NULL), mCOFWearables(NULL),
mInventoryItemsPanel(NULL), mInventoryItemsPanel(NULL),
mAddToOutfitBtn(NULL),
mRemoveFromOutfitBtn(NULL),
mLookObserver(NULL) mLookObserver(NULL)
{ {
mSavedFolderState = new LLSaveFolderState(); mSavedFolderState = new LLSaveFolderState();
...@@ -216,13 +214,6 @@ BOOL LLPanelOutfitEdit::postBuild() ...@@ -216,13 +214,6 @@ BOOL LLPanelOutfitEdit::postBuild()
mAddToLookBtn->setEnabled(FALSE); mAddToLookBtn->setEnabled(FALSE);
mAddToLookBtn->setVisible(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 = getChild<LLButton>("edit_wearable_btn");
mEditWearableBtn->setEnabled(FALSE); mEditWearableBtn->setEnabled(FALSE);
mEditWearableBtn->setVisible(FALSE); mEditWearableBtn->setVisible(FALSE);
...@@ -383,8 +374,6 @@ void LLPanelOutfitEdit::onRemoveFromOutfitClicked(void) ...@@ -383,8 +374,6 @@ void LLPanelOutfitEdit::onRemoveFromOutfitClicked(void)
LLAppearanceMgr::getInstance()->removeItemFromAvatar(id_to_remove); LLAppearanceMgr::getInstance()->removeItemFromAvatar(id_to_remove);
updateLookInfo(); updateLookInfo();
mRemoveFromOutfitBtn->setEnabled(FALSE);
} }
...@@ -438,10 +427,7 @@ void LLPanelOutfitEdit::onInventorySelectionChange(const std::deque<LLFolderView ...@@ -438,10 +427,7 @@ void LLPanelOutfitEdit::onInventorySelectionChange(const std::deque<LLFolderView
case LLAssetType::AT_CLOTHING: case LLAssetType::AT_CLOTHING:
case LLAssetType::AT_BODYPART: case LLAssetType::AT_BODYPART:
case LLAssetType::AT_OBJECT: case LLAssetType::AT_OBJECT:
childSetEnabled("add_to_outfit_btn", true);
break;
default: default:
childSetEnabled("add_to_outfit_btn", false);
break; break;
} }
...@@ -474,10 +460,7 @@ void LLPanelOutfitEdit::onOutfitItemSelectionChange(void) ...@@ -474,10 +460,7 @@ void LLPanelOutfitEdit::onOutfitItemSelectionChange(void)
{ {
case LLAssetType::AT_CLOTHING: case LLAssetType::AT_CLOTHING:
case LLAssetType::AT_OBJECT: case LLAssetType::AT_OBJECT:
mRemoveFromOutfitBtn->setEnabled(TRUE);
break;
default: default:
mRemoveFromOutfitBtn->setEnabled(FALSE);
break; break;
} }
} }
......
indra/newview/llpaneloutfitedit.h
+ 0
− 2
View file @ 9fda4623
...@@ -122,8 +122,6 @@ class LLPanelOutfitEdit : public LLPanel ...@@ -122,8 +122,6 @@ class LLPanelOutfitEdit : public LLPanel
LLFilterEditor* mSearchFilter; LLFilterEditor* mSearchFilter;
LLSaveFolderState* mSavedFolderState; LLSaveFolderState* mSavedFolderState;
std::string mSearchString; std::string mSearchString;
LLButton* mAddToOutfitBtn;
LLButton* mRemoveFromOutfitBtn;
LLButton* mEditWearableBtn; LLButton* mEditWearableBtn;
LLToggleableMenu* mSaveMenu; LLToggleableMenu* mSaveMenu;
......
indra/newview/skins/default/xui/en/panel_cof_wearables.xml
+ 10
− 10
View file @ 9fda4623
...@@ -7,18 +7,18 @@ ...@@ -7,18 +7,18 @@
height="200" height="200"
left="0" left="0"
name="cof_wearables" name="cof_wearables"
width="313"> width="311">
<accordion <accordion
follows="all" follows="all"
height="200" height="200"
layout="topleft" layout="topleft"
left="3" left="0"
single_expansion="true" single_expansion="true"
top="0" top="0"
name="cof_wearables_accordion" name="cof_wearables_accordion"
background_visible="true" background_visible="true"
bg_alpha_color="DkGray2" bg_alpha_color="DkGray2"
width="307"> width="311">
<accordion_tab <accordion_tab
layout="topleft" layout="topleft"
name="tab_attachments" name="tab_attachments"
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
left="0" left="0"
name="list_attachments" name="list_attachments"
top="0" top="0"
width="307" /> width="311" />
</accordion_tab> </accordion_tab>
<accordion_tab <accordion_tab
layout="topleft" layout="topleft"
...@@ -49,14 +49,14 @@ ...@@ -49,14 +49,14 @@
left="0" left="0"
name="button_bar_adaptor" name="button_bar_adaptor"
top="0" top="0"
width="307"> width="311">
<panel <panel
bevel="none" bevel="none"
filename="panel_clothing_list_button_bar.xml" filename="panel_clothing_list_button_bar.xml"
height="35" height="35"
name="button_bar" name="button_bar"
top="0" top="0"
width="307" /> width="311" />
<flat_list_view <flat_list_view
allow_select="true" allow_select="true"
follows="all" follows="all"
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
left="0" left="0"
name="list_clothing" name="list_clothing"
top_pad="0" top_pad="0"
width="307" /> width="311" />
</panel> </panel>
</accordion_tab> </accordion_tab>
<accordion_tab <accordion_tab
...@@ -84,14 +84,14 @@ ...@@ -84,14 +84,14 @@
left="0" left="0"
name="button_bar_adaptor" name="button_bar_adaptor"
top="0" top="0"
width="307"> width="311">
<panel <panel
bevel="none" bevel="none"
filename="panel_bodyparts_list_button_bar.xml" filename="panel_bodyparts_list_button_bar.xml"
height="35" height="35"
name="button_bar" name="button_bar"
top="0" top="0"
width="307"/> width="311"/>
<flat_list_view <flat_list_view
allow_select="true" allow_select="true"
follows="all" follows="all"
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
left="0" left="0"
name="list_body_parts" name="list_body_parts"
top_pad="0" top_pad="0"
width="307" /> width="311" />
</panel> </panel>
</accordion_tab> </accordion_tab>
</accordion> </accordion>
......
indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+ 49
− 117
View file @ 9fda4623
...@@ -69,19 +69,21 @@ ...@@ -69,19 +69,21 @@
<!-- "HEADER WITH ICON, STATUS TEXT AND OUTFIT NAME" --> <!-- "HEADER WITH ICON, STATUS TEXT AND OUTFIT NAME" -->
<panel <panel
background_visible="true"
bg_alpha_color="DkGray2"
bevel_style="none" bevel_style="none"
follows="top|left|right" follows="top|left|right"
height="45" height="40"
label="bottom_panel" label="bottom_panel"
layout="topleft" layout="topleft"
left="5" left="6"
name="header_panel" name="header_panel"
top_pad="5" top_pad="5"
width="300"> width="311">
<icon <icon
follows="left|top" follows="left|top"
height="40" height="40"
image_name="t-shirt-image" image_name="TabIcon_Appearance_Off"
left="2" left="2"
mouse_opaque="false" mouse_opaque="false"
name="outfit_icon" name="outfit_icon"
...@@ -92,35 +94,35 @@ ...@@ -92,35 +94,35 @@
<panel <panel
bevel_style="none" bevel_style="none"
follows="top|right" follows="top|right"
height="40" height="38"
label="bottom_panel" label="bottom_panel"
layout="topleft" layout="topleft"
left_pad="10" left_pad="5"
name="outfit_name_and_status" name="outfit_name_and_status"
top="2" top="2"
width="200"> width="270">
<text <text
follows="top|left|right" follows="top|left|right"
font="SansSerif" font="SansSerifSmallBold"
height="13" height="13"
layout="topleft" layout="topleft"
name="status" name="status"
text_color="Green" text_color="EmphasisColor"
top="0" top="2"
value="Editing..." value="Now editing..."
use_ellipses="true" use_ellipses="true"
width="275" /> width="270" />
<text <text
follows="bottom|left|right" follows="bottom|left|right"
font="SansSerifHugeBold" font="SansSerifLargeBold"
height="26" height="26"
layout="topleft" layout="topleft"
name="curr_outfit_name" name="curr_outfit_name"
text_color="LtGray" text_color="LtGray"
top_pad="0" top_pad="2"
value="[Current Outfit]" value="[Current Outfit]"
use_ellipses="true" use_ellipses="true"
width="275" /> width="270" />
</panel> </panel>
</panel> </panel>
...@@ -130,47 +132,49 @@ ...@@ -130,47 +132,49 @@
animate="false" animate="false"
default_tab_group="2" default_tab_group="2"
follows="all" follows="all"
height="450" height="495"
width="300" width="313"
layout="topleft" layout="topleft"
orientation="vertical" orientation="vertical"
name="im_panels" name="im_panels"
tab_group="1" tab_group="1"
top_pad="10" top_pad="5"
left="5"> left="5">
<layout_panel <layout_panel
layout="topleft" layout="topleft"
height="225" height="220"
label="IM Control Panel" label="IM Control Panel"
min_height="100" min_height="100"
name="outfit_wearables_panel" name="outfit_wearables_panel"
width="300" width="313"
auto_resize="true" auto_resize="true"
user_resize="true"> user_resize="true">
<!-- List containing items from the COF and Base outfit --> <!-- List containing items from the COF and Base outfit -->
<panel <panel
background_visible="false"
class="cof_wearables" class="cof_wearables"
filename="panel_cof_wearables.xml" filename="panel_cof_wearables.xml"
follows="left|top|right|bottom" follows="left|top|right|bottom"
height="198" height="193"
layout="topleft" layout="topleft"
left="0" left="1"
name="cof_wearables_list" name="cof_wearables_list"
top="0" top="0"
width="300" /> width="311" />
<panel <!-- Button bar -->
<panel
background_visible="true" background_visible="true"
bevel_style="none" bevel_style="none"
bottom="0"
follows="bottom|left|right" follows="bottom|left|right"
height="27" height="27"
label="bottom_panel" label="bottom_panel"
layout="bottomleft" layout="topleft"
left="0" left="0"
name="edit_panel" name="edit_panel"
width="300"> top="193"
width="313">
<button <button
follows="bottom|left" follows="bottom|left"
height="25" height="25"
...@@ -183,74 +187,14 @@ ...@@ -183,74 +187,14 @@
name="gear_menu_btn" name="gear_menu_btn"
top="1" top="1"
width="31" /> 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 <icon
follows="bottom|left" follows="bottom|left|right"
height="25" height="25"
image_name="Toolbar_Middle_Off" image_name="Toolbar_Right_Off"
layout="topleft" layout="topleft"
left_pad="1" left_pad="1"
name="dummy_icon" name="dummy_right_icon"
width="105" /> width="281" />
<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" />
</panel> </panel>
</layout_panel> </layout_panel>
...@@ -258,10 +202,10 @@ ...@@ -258,10 +202,10 @@
<layout_panel <layout_panel
auto_resize="true" auto_resize="true"
default_tab_group="3" default_tab_group="3"
height="225" height="210"
min_height="225" min_height="210"
name="add_wearables_panel" name="add_wearables_panel"
width="300" width="313"
tab_group="2" tab_group="2"
user_resize="true" user_resize="true"
visible="false"> visible="false">
...@@ -445,22 +389,6 @@ ...@@ -445,22 +389,6 @@
name="add_to_outfit_btn" name="add_to_outfit_btn"
top="1" top="1"
width="31" /> 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> </panel>
</layout_panel> </layout_panel>
</layout_stack> </layout_stack>
...@@ -469,25 +397,28 @@ ...@@ -469,25 +397,28 @@
follows="left|right|bottom" follows="left|right|bottom"
height="30" height="30"
layout="topleft" layout="topleft"
left="5" left="4"
top_pad="10" top_pad="2"
name="save_revert_button_bar" name="save_revert_button_bar"
width="300"> width="300">
<button <button
follows="bottom|left|right" follows="bottom|left"
height="23" height="23"
label="Save" label="Save"
left="0" left="0"
layout="topleft" layout="topleft"
name="save_btn" name="save_btn"
width="145" /> top="0"
width="155" />
<button <button
follows="bottom|right" follows="bottom|left"
height="23" height="23"
name="save_flyout_btn" name="save_flyout_btn"
label="" label=""
layout="topleft"
left_pad="-20" left_pad="-20"
tab_stop="false" tab_stop="false"
top="0"
image_selected="SegmentedBtn_Right_Selected_Press" image_selected="SegmentedBtn_Right_Selected_Press"
image_unselected="SegmentedBtn_Right_Off" image_unselected="SegmentedBtn_Right_Off"
image_pressed="SegmentedBtn_Right_Press" image_pressed="SegmentedBtn_Right_Press"
...@@ -497,10 +428,11 @@ ...@@ -497,10 +428,11 @@
<button <button
follows="bottom|left|right" follows="bottom|left|right"
height="23" height="23"
left_pad="15" left_pad="12"
label="Revert" label="Revert"
layout="topleft" layout="topleft"
name="revert_btn" name="revert_btn"
width="145" /> top="0"
width="147" />
</panel> </panel>
</panel> </panel>
indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+ 1
− 1
View file @ 9fda4623
...@@ -106,7 +106,7 @@ width="333"> ...@@ -106,7 +106,7 @@ width="333">
<panel <panel
class="panel_outfit_edit" class="panel_outfit_edit"
filename="panel_outfit_edit.xml" filename="panel_outfit_edit.xml"
height="550" height="565"
follows="all" follows="all"
layout="topleft" layout="topleft"
left="5" left="5"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment