livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-4239 FIXED Add items to outfit without replacing whole current outfit

master
Mnikolenko ProductEngine 2014-07-18 11:40:15 +03:00
parent 8cb0b6308b
commit 19bc1ee671
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llinventorybridge.cpp
View File

@ -2809,7 +2809,7 @@ void LLInventoryCopyAndWearObserver::changed(U32 mask)
mContentsCount)
{
gInventory.removeObserver(this);
LLAppearanceMgr::instance().wearInventoryCategory(category, FALSE, FALSE);
LLAppearanceMgr::instance().wearInventoryCategory(category, FALSE, TRUE);
delete this;
}
}

16
indra/newview/skins/default/xui/en/floater_openobject.xml
View File

@ -6,7 +6,7 @@
height="350"
layout="topleft"
min_height="160"
min_width="270"
min_width="280"
name="objectcontents"
help_topic="objectcontents"
save_rect="true"
@ -40,10 +40,10 @@
<button
follows="bottom|left"
height="23"
label="Copy To Inventory"
label_selected="Copy To Inventory"
label="Copy to inventory"
label_selected="Copy to inventory"
layout="topleft"
left="20"
left="15"
name="copy_to_inventory_button"
tab_group="1"
top_pad="5"
@ -54,12 +54,12 @@
<button
follows="bottom|left"
height="23"
label="Copy And Wear"
label_selected="Copy And Wear"
label="Copy and add to outfit"
label_selected="Copy and add to outfit"
layout="topleft"
left_pad="10"
left_pad="5"
name="copy_and_wear_button"
width="120">
width="135">
<button.commit_callback
function="OpenObject.MoveAndWear" />
</button>