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
|
|
List View when (+) button clicked on unwearable items or by selecting 'Replace' menu item from body part context menu
--HG--
branch : product-engine
|
|
spec.
* moved logic related to combo button from LLPanelOutfitEdit to LLSaveOutfitComboBtn class;
* used LLSaveOutfitComboBtn class in LLPanelOutfitsInventory;
reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/459/
--HG--
branch : product-engine
|
|
Added a check for visibility changes that should prevent users from getting
"stuck" in appearance editing mode by closing the appearance editor
prematurely (clicking sidebar hide, etc).
Camera state should be restored when panel is restored.
reviewed by Seraph
|
|
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
|
|
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
|
|
replacing/wearing outfit externally (my inventory)
Reviewed by Neal Orman and Mike Antipov
--HG--
branch : product-engine
|
|
Most changes are in xml, but changing of view buttons overlay icons in lists from add wearables is implemented in code. Dragbar icon was only added as file, it will be integrated in EXT-7255 (There is no dragbar between 'Edit Outfit' and 'Add to Outfit:' panels).
Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/410/
--HG--
branch : product-engine
|
|
--HG--
branch : product-engine
|
|
menu and made it open the shape editing panel.
Again, as in EXT-7241, I tried to improve the way the appearance panels (outfits / edit outfit / edit wearables) are switched, this time aiming to eliminate redundant time-consuming operations (fetches/updated/etc).
I'm not particularly satisfied with the resulting code but it seems to work. A better solution might be to wrap the panels with LLSideTrayPanelContainer.
Additional minor changes:
- Fixed unsafe pointer cast in LLSidepanelAppearance::editWearable().
- Removed redundant onEditOutfitButtonClicked() and onEditWearBackClicked() methods from LLSidepanelAppearance.
Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/395/
--HG--
branch : product-engine
|
|
by their visibility
deciding which list to use (folder/list view) depending on their conrainers visibility
Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/405/
--HG--
branch : product-engine
|
|
in Outfit Editor)
- HandleDragAndDrop() method was overridden in the LLPanelOutfitEdit class to handle drag and drop operations of the Clothing, Body Parts and Attachments.
- In panel_outfit_edit.xml parameter allow_multi_select was set to true to allow multiple selections.
- Added class LLCOFDragAndDropObserver to implement the drag and drop.
- Class LLInventoryMoveFromWorldObserver renamed to LLInventoryAddItemByAssetObserver.
Drag and drop reimplemented using functionality of the LLInventoryAddItemByAssetObserver.
Reviewed by Neal Orman and Mike Antipov at https://codereview.productengine.com/secondlife/r/373/
--HG--
branch : product-engine
|
|
Reviewed by Vadim Savchuk and Neal Orman at https://codereview.productengine.com/secondlife/r/380
--HG--
branch : product-engine
|
|
- Insert filter editor and inventory panels into layout_stack
- restored filter functionality for a list view
- added proper switching between flat list view and folder list view
- made a little optimization: got rid of redundant findChild calls because of childSetVisible(..., childGetValue(...));
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/362/
--HG--
branch : product-engine
|
|
oufit changes
--HG--
branch : product-engine
|
|
wearables order changes)
- added observing changes in the COF (based on version changes of the COF category, COF's version is also updated when order of COF items is changed)
- got rid of outfit fetcher, cause the only used outfit is COF which is always in a fetched state
- minor cleanup
Reviewed by Mike Antipov and Neal Orman at https://codereview.productengine.com/secondlife/r/356/
--HG--
branch : product-engine
|
|
By the way, removed "Add to outfit" and "Remove from outfit" buttons from the Edit Outfit panels.
--HG--
branch : product-engine
|
|
t-shirt icon etc.).
- Removed temporary "up", "down", "new" buttons.
- Fixed misc positions/dimensions/fonts/colors/images.
Reviewed by Mike at https://codereview.productengine.com/secondlife/r/343/
--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
|
|
"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
|
|
--HG--
branch : product-engine
|
|
- added functionality to change order of wearables
- added ad-hoc up and down buttons on a button bar ("up" means closer to the body) - https://jira.secondlife.com/secure/attachment/38464/screenshot-1.jpg
- added displaying wearables as sorted by order on the Edit Outfit panel (top list)
Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/280/
--HG--
branch : product-engine
|
|
inventory for "add wearables" panel of outfit editor
1. Modified LLInventoryItemsList - implemented delayed item construction. Items are added during draw, not more than 50 items will be added in single draw. This lets us reduce system overload during multiple panel construction.
2. Implemented LLFilteredWearableListManager to populate inventory flat list with data. This class filters entire inventory according to specified filter and populates specified inventory list with data.
3. Created LLCommonUtil::computeDifference() to avoid code copy-pasting(will use it in all appropriate places in next review request)
Reviewed by Mike Antipov - https://codereview.productengine.com/secondlife/r/301/
--HG--
branch : product-engine
|
|
NOTE: this is a temporary fix, see EXT-6564(Fix wearable editing panels) for more info.
Fix info:
- Moved edit wearable button to place where it does not break widget paddings.
- Updated code that calculates button position.
- Sending button to front to ensure it is clickable and visible.
Not reviewed.
--HG--
branch : product-engine
|
|
Clothes/Body, Objects, All) on Add to Outfit subpanel
Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/221/
--HG--
branch : product-engine
|
|
Added temporary "edit" button to outfit list to allow QA test new wearable edit panels.
Was not reviewed.
--HG--
branch : product-engine
|
|
|
|
|
|
avatar (from COF)
Trash button removes from avatar a selected item only of "clothing" and "object" types
Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/209/
--HG--
branch : product-engine
|
|
On revert the base outfit is worn
Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/205/
--HG--
branch : product-engine
|
|
Current Outfit (Edit Outfit panel)
Added temporary PLUS button on the button bar under the top list of Edit Outfit panel
Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/203/
--HG--
branch : product-engine
|
|
--HG--
branch : product-engine
|
|
Implemented "Save", "Save as new" functionality. If the base outfit doesn't exist "Save as new" functionality is employed
Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/179
--HG--
branch : product-engine
|
|
|
|
|
|
|
|
Updated layout of all Edit Wearable panels.
Disabled editing of no-modify wearable.
Disabled "Save As" for no-copy wearable.
Reviewed by Mike Antipov https://codereview.productengine.com/secondlife/r/170/
--HG--
branch : product-engine
|
|
base abstract LLInventoryFetchObserver class
Added a new abstract class LLInventoryFetchObserver from which LLInventoryFetchItems and LLInventoryFetchDescendents inherit.
Also changed isEverythingComplete to isFinished and made some other minor superficial changes.
|
|
vector of items)
Added new constructors to LLInventoryFetch types to allow passing in a single item.
|
|
observer list automatically
FetchObservers now take in a list of IDs to check against.
Made some naming changes.
|
|
|
|
observer list automatically
Preliminary work to clean up naming conventions.
|
|
the Current Outfit system folder
reviewed at https://codereview.productengine.com/secondlife/r/159/
--HG--
branch : product-engine
|
|
- Added NULL check for selected item pointer.
Reviewed by Neal Orman https://codereview.productengine.com/secondlife/r/162/
--HG--
branch : product-engine
|
|
Outfit: Clean up XUI to allow all elements to fit properly in the panel
Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/143/
--HG--
branch : product-engine
|
|
--HG--
branch : product-engine
|
|
--HG--
branch : product-engine
|
|
renamed panel_look_info.xml to panel_outfit_edit.xml
renamed llpanellookinfo.cpp/llpanellookinfo.h to llpaneloutfitedit.cpp/llpaneloutfitedit.h
renamed LLPanelLookInfo to LLPanelOutfitEdit
Reviewed at https://codereview.productengine.com/secondlife/r/130/
--HG--
branch : product-engine
|