Age | Commit message (Collapse) | Author |
|
Semi-automatically resolved conflicts in:
* indra/newview/llappearancemgr.cpp
* indra/newview/llappviewer.cpp
* indra/newview/llcofwearables.cpp
* indra/newview/llinventoryfunctions.cpp
* indra/newview/llpaneloutfitedit.cpp
* indra/newview/skins/default/xui/en/strings.xml
* indra/newview/skins/default/xui/ja/strings.xml
--HG--
branch : product-engine
|
|
items and by selecting 'Replace' menu item click body part context menu
Main changes:
- Added callback for a '(+) button' to the LLCOFCallbacks and bind it with LLPanelOutfitEdit::onAddWearableClicked
- Created the callback(LLPanelOutfitEdit::onReplaceBodyPartMenuItemClicked) for 'Replace' menu item of context menu
Related changes:
- Changed LLFilteredWearableListManager so that it can use different functors (subclasses of LLInventoryCollectFunctor) as a criterion for LLInventoryItemsList filtering. Before it used only LLFindNonLinksByMask filter. Moved LLFindNonLinksByMask from to the llfilteredwearablelist.cpp to the llinventoryfunctions.h
- Created getter 'LLPanelDummyClothingListItem::getWearableType()' for LLPanelDummyClothingListItem
- Made 'add wearables panel' a member of LLPanelOutfitEdit so that not to use findChild each time panel is needed
Reviewed by Igor Borovkov at http://jira.secondlife.com/browse/EXT-7472
--HG--
branch : product-engine
|
|
Checker: NULL_RETURNS
Function: LLCOFWearables::buildClothingListItem(LLViewerInventoryItem *, bool, bool)
File: /indra/newview/llcofwearables.cpp
|
|
Checker: NULL_RETURNS
Function: LLCOFWearables::buildBodypartListItem(LLViewerInventoryItem *)
File: /indra/newview/llcofwearables.cpp
|
|
Reviewed by Mike Antipov and Nyx at https://codereview.productengine.com/secondlife/r/428/
--HG--
branch : product-engine
|
|
Shared code with avatar lists context menus.
Reviewed by Mike Antipov and Nyx at https://codereview.productengine.com/secondlife/r/415/
--HG--
branch : product-engine
|
|
- Moved wearable item name comparator from llcofwearables to llwearableitemslist.
- Added wearable item type comparator.
- Added item type and description getters to wearable item base class LLPanelInventoryListItemBase.
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/407/
--HG--
branch : product-engine
|
|
added a flat list view comparator for names of wearable list items
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/384/
--HG--
branch : product-engine
|
|
added a deletable wearable item, predecessor of a clothing item, which is used for attachment items
Reviewed by Neal Orman and Mike Antipov at https://codereview.productengine.com/secondlife/r/377
--HG--
branch : product-engine
|
|
Refactored LLWearableDictionary to look more like LLAssetType/LLFolderType/etc. in terms of code design. This required a lot of superficial changes across many files. Overall functionality has not changed.
|
|
in panel outfit edit
- reversed iterating order
- switched up/down buttons' callbacks
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/359/
--HG--
branch : product-engine
|
|
selection across COF wearables lists updates (i.e. when changing ordering of wearables - up/down).)
- implemented preserving of current items selection during lists updates.
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/344/
--HG--
branch : product-engine
|
|
"clothing" accordion tab of outfit editor
* reimplemented button bars as static panels not as list items (creating accordion - button bar - list view - adaptor/container)
* added management of items' buttons assording to inventory items' states
* assigned actions to clothing/bodyparts items' buttons
* got rid of separators as distinct items and made them as part of items
* removed ad-hoc up/down buttons
* removed "+" button from a button bar
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/322
--HG--
branch : product-engine
|
|
for unworn wearable types)
Added new wearable list item - LLPanelDummyClothingListItem for not worn wearable types, it displays grayed wearable type icon, grayed
title '<clothing type> not worn' and 'add' button.
Modified base class to be more flexible.
Moved init() to protected section.
Modified COF panel to use dummy item.
Reviewed by Mike Antipov - https://codereview.productengine.com/secondlife/r/335/
--HG--
branch : product-engine
|
|
--HG--
branch : product-engine
|
|
and put proper icon on it
Replaced LLPanelInventoryListItem with LLPanelInventoryListItem. This class is capable of showing widgets on left and right sides of panel.
Implemented LLPanelClothingListItem and LLPanelBodyPartListItem - makes use of new LLPanelInventoryListItem and is able to show buttons specified in tickets. Buttons are
shown on mouse_enter event and hidden on mouse_leave event. Buttons are - delete, move up, move down, lock, edit. It's item's user responsibility
to control buttons visibility.
Made LLInventoryItemsList::addNewItem virtual to allow inheritors create specific(non-default) items.
Reviewed by Mike Antipov - https://codereview.productengine.com/secondlife/r/325/
--HG--
branch : product-engine
|
|
"clothing" accordion tab of outfit editor
- added grouping clothing items by wearable type (shirt, jeans etc.)
- added sorting clothing items by wearing order in groups
- added separators between items of the same wearable type (lists: clothing, body parts)
- added list specific button bars
- partially added dummy items for missing wearable types in the COF (clothing list)
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/322
--HG--
branch : product-engine
|
|
"clothing" accordion tab of outfit editor
Initial implementation (no sorting, no grayed items from Base outfit)
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/322
--HG--
branch : product-engine
|