diff options
| -rw-r--r-- | indra/newview/llpaneloutfitedit.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_outfit_edit.xml | 26 |
3 files changed, 18 insertions, 13 deletions
diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp index ba6473839a..ce17e1d624 100644 --- a/indra/newview/llpaneloutfitedit.cpp +++ b/indra/newview/llpaneloutfitedit.cpp @@ -468,13 +468,14 @@ void LLPanelOutfitEdit::onOutfitItemSelectionChange(void) return; LLRect item_rect; - mLookContents->localRectToOtherView(item->getRect(), &item_rect, getChild<LLUICtrl>("outfit_wearables_panel")); + mLookContents->localRectToOtherView(item->getRect(), &item_rect, this); // TODO button(and item list) should be removed (when new widget is ready) LLRect btn_rect = mEditWearableBtn->getRect(); btn_rect.set(item_rect.mRight - btn_rect.getWidth(), item_rect.mTop, item_rect.mRight, item_rect.mBottom); mEditWearableBtn->setShape(btn_rect); + sendChildToFront(mEditWearableBtn); mEditWearableBtn->setEnabled(TRUE); if (!mEditWearableBtn->getVisible()) diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index c8a4b27f40..960d9919ab 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -1799,7 +1799,7 @@ void inventory_offer_handler(LLOfferInfo* info) payload["give_inventory_notification"] = TRUE; LLNotification::Params params(p.name); params.substitutions = p.substitutions; - params.payload = p.payload; + params.payload = payload; LLPostponedNotification::add<LLPostponedOfferNotification>( params, info->mFromID, false); } } 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 bc37af0319..c77e4e8d5e 100644 --- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml @@ -30,6 +30,20 @@ <string name="Filter.Clothes/Body" value="Clothes/Body"/> <string name="Filter.Objects" value="Objects"/> + <!-- + TODO remove this button. Added it temporary for QA to be able to test new edit wearable + panel (see EXT-6564) + --> + <button + follows="left|top|right" + height="20" + label="edit" + left="0" + top="0" + layout="topleft" + name="edit_wearable_btn" + width="40" /> + <button follows="top|left" height="23" @@ -158,18 +172,8 @@ sort_column="look_item_sort" name="look_item_sort" /> </scroll_list> - <!-- TODO remove this button. Added it temporary for QA to be able to test new edit wearable panel (see EXT-6564)--> - <button - follows="left|top|right" - height="20" - label="edit" - left="0" - top="0" - layout="topleft" - name="edit_wearable_btn" - width="40" /> - <panel + <panel background_visible="true" bevel_style="none" follows="bottom|left|right" |