From f954936d600c24d5263ee100d3808503b34fc6fc Mon Sep 17 00:00:00 2001 From: Igor Borovkov Date: Fri, 4 Jun 2010 15:53:07 +0300 Subject: EXT-7575 FIXED appended attachment location after name in parenthesis. Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/514 --HG-- branch : product-engine --- indra/newview/llcofwearables.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llcofwearables.cpp') diff --git a/indra/newview/llcofwearables.cpp b/indra/newview/llcofwearables.cpp index 7ac3d14c72..05046aca5a 100644 --- a/indra/newview/llcofwearables.cpp +++ b/indra/newview/llcofwearables.cpp @@ -427,7 +427,7 @@ LLPanelDeletableWearableListItem* LLCOFWearables::buildAttachemntListItem(LLView llassert(item); if (!item) return NULL; - LLPanelDeletableWearableListItem* item_panel = LLPanelDeletableWearableListItem::create(item); + LLPanelAttachmentListItem* item_panel = LLPanelAttachmentListItem::create(item); if (!item_panel) return NULL; //setting callbacks -- cgit v1.2.3 From 65f8d1822d058aee1902238e298f760368b724f6 Mon Sep 17 00:00:00 2001 From: Andrew Dyukov Date: Fri, 4 Jun 2010 20:21:07 +0300 Subject: EXT-7511 FIXED Resolved problem with cropping of item selection bottom Problem reproduced for items which had divider at the bottom. It was caused by non-optimal placement of divider in item. To fix this, "top" attribute of divider was changed, and when done so it turned out that increase of items height from implementation of this task was not necessary, so rolled back these changes in xml and code. Also added some padding between flatlists items to avoid cropping of top part of item selection because of divider. Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/502/ --HG-- branch : product-engine --- indra/newview/llcofwearables.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'indra/newview/llcofwearables.cpp') diff --git a/indra/newview/llcofwearables.cpp b/indra/newview/llcofwearables.cpp index 05046aca5a..916d53da3c 100644 --- a/indra/newview/llcofwearables.cpp +++ b/indra/newview/llcofwearables.cpp @@ -387,13 +387,7 @@ LLPanelClothingListItem* LLCOFWearables::buildClothingListItem(LLViewerInventory item_panel->childSetAction("btn_edit", mCOFCallbacks.mEditWearable); //turning on gray separator line for the last item in the items group of the same wearable type - if (last) - { - LLRect rect = item_panel->getRect(); - item_panel->reshape(rect.getWidth(), rect.getHeight() + - item_panel->getChild("wearable_type_separator_icon")->getRect().getHeight()); - item_panel->childSetVisible("wearable_type_separator_icon", true); - } + item_panel->childSetVisible("wearable_type_separator_icon", last); return item_panel; } -- cgit v1.2.3