summaryrefslogtreecommitdiff
path: root/indra/newview/llpaneloutfitedit.cpp
AgeCommit message (Collapse)Author
2010-06-08EXT-7644 FIXED Implemented functionality for locking outfit modification ↵Alexei Arabadji
controls and used it for 'save outfit' action. 1 Added functionality for locking outfit in LLAppearanceMgr. Outfit should be locked when outfit related operation is started(now it is used for updateBaseOutfit) and unlocked when operation completed or timeout is exceeded. 2 Added outfit saved and outfit lock changed signals to LLOutfitObserver. 3 Updated LLPanelOutfitsInventory and LLPanelOutfitEdit with functionality of controlling 'save outfit' controls state('save outfit' controls should be enabled only if outfit isn't locked and outfit is dirty). 4 Renamed action label of method LLPanelOutfitsInventory::isActionEnabled "make_outfit" to "save_outfit". --HG-- branch : product-engine
2010-06-07EXT-7406 FIXED extended find wearables of type functor to filter out links ↵Igor Borovkov
(panel outfit edit) extended find wearables of type functor to filter out links Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/522 --HG-- branch : product-engine
2010-06-04EXT-7485 FIXED Provided update of 'save as' button status and save outfit ↵Alexei Arabadji
panel status. 1 published LLCOFObserver as LLOutfitObserver(moved from llpaneloutfitedit.cpp to lloutfitobserver.h) 2 decoupled outfit edit panel and observer by replacing pointer to panel with signals and made observer as singleton 3 moved call of LLAppearanceMgr::getInstance()->updateIsDirty() from outfit edit panel to observer(discussed with IB) 4 modified updating of combo button state on outfit panel using LLOutfitObserver 5 modified refresh of outfit name and status on outfit change event using LLOutfitObserver 6 removed unnecessary LLWatchForOutfitRenameObserver that caused excessive updates of outfit panel status name --HG-- branch : product-engine
2010-06-03EXT-7503 WIP Made first inventory fetch for Add to Outfit panel on the first ↵Mike Antipov
openning, updated reliability of LLInventoryFetchItemsObserver This patch follows (fce2d4f9dc1a). And contains missed by merging changes and fixes Win line endings. Reviewed by Brad Payne at https://codereview.productengine.com/secondlife/r/456/ --HG-- branch : product-engine
2010-06-03mergeMike Antipov
--HG-- branch : product-engine
2010-06-03EXT-7503 WIP Made first inventory fetch for Add to Outfit panel on the first ↵Mike Antipov
openning, updated reliability of LLInventoryFetchItemsObserver * Moved initialization (with start fetch) of the LLFilteredWearableListManager into LLPanelOutfitEdit::onOpen * LLFilteredWearableListManager::changed now ignores non-related inventory changes (CALLING_CARD, GESTURE, SORT) Tried to fix an issue with empty Gesture list on startup with clean inventory cache. Reason: logic is based on count of "inventory changed" events. In case of there was too many requests requested items can be removed from queue by mistake. * Increased a number of the "change()" method calls to wait fetched items. Unfortunately this only works if My Inventory category does not have too many children. An does not work if it has 2000+ items Logic to remove item from the incompleted list should be based on timer and number of attempts. Also add some debug information about fetching inventory category and its content to log. Reviewed by Brad Payne at https://codereview.productengine.com/secondlife/r/456/ --HG-- branch : product-engine
2010-06-02EXT-6726 WIP Added missing menu items to the Appearance SP.Vadim Savchuk
- Hooked up Wear / Take off / Rename / Delete items in the My Outfits gear menu. - Added "Create new..." to body part / clothing context menu in Edit Outfit. - Added "Create new..." submenus to the Edit Outfit gear menu. - Disabling the "Take Off" menu item of the clothing context menu in the Edit Outfit panel when it's irrelevant. Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/494/ --HG-- branch : product-engine
2010-06-01EXT-7527 FIXED repositioned "Add more..." button (panel edit outfit)Igor Borovkov
- relocated Add button (required substantial layout_stacks repositioning) - got rid of switch/shop buttons - reverted addition of adaptors for (accordion tabs/list view) inline button bars * failed to get rid of an empty space above bottom bars when "add wearables panel" is invisible (due to bug in the layout stack, when border is still drawn below layout panel which is only one visible) https://jira.secondlife.com/secure/attachment/39854/empty+space+.jpg Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/481/ --HG-- branch : product-engine
2010-05-31EXT-7201 FIXED Removed extra gear menu button.Sergei Litovchuk
- Removed extra gear button bar from "Edit Outfit" panel. - Added one more dummy icon to "Add Wearable" panel button bar to chose the right dummy depending on the "Add Wearable" panel visibility. Reviewed by Vadim Savchuk https://codereview.productengine.com/secondlife/r/473/ --HG-- branch : product-engine
2010-05-31merge; fixed gcc buildVadim Savchuk
--HG-- branch : product-engine
2010-05-31Manual merge from default branch.Vadim Savchuk
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
2010-05-31EXT-7472 ADDITIONAL FIX Added panel switching from Tree List View to Flat ↵Paul Guslisty
List View when (+) button clicked on unwearable items or by selecting 'Replace' menu item from body part context menu --HG-- branch : product-engine
2010-05-31EXT-7485 FIXED Updated 'save as new' button on inventory outfit pane to fit ↵Alexei Arabadji
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
2010-05-28EXT-7505 FIX stuck in appearance edit mode if close appearance sidebarNyx (Neal Orman)
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
2010-05-28EXT-7472 FIXED Open add to outfit panel by (+) button click on unwearable ↵Paul Guslisty
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
2010-05-20EXT-6726 WIP Added stubs for most of Appearance SP context/gear menus.Vadim Savchuk
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
2010-05-21EXT-7331 FIXED added updating the title (panel outfit edit) on ↵Igor Borovkov
replacing/wearing outfit externally (my inventory) Reviewed by Neal Orman and Mike Antipov --HG-- branch : product-engine
2010-05-20EXT-7200 FIXED Integrated art missing from appearance.Andrew Dyukov
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
2010-05-19mergeVadim Savchuk
--HG-- branch : product-engine
2010-05-19EXT-7242 FIXED Added a new "Edit my Shape" link to avatar self-click context ↵Vadim Savchuk
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
2010-05-19EXT-7234 FIXED whether folder view or list view is currently used is decided ↵Igor Borovkov
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
2010-05-17EXT-7199 FIXED (Enable dragging items from inventory view to current outfit ↵Andrew Polunin
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
2010-05-13EXT-7243 FIXED assigned a callback to the add_to_outfit_btn (panel outfit edit)Igor Borovkov
Reviewed by Vadim Savchuk and Neal Orman at https://codereview.productengine.com/secondlife/r/380 --HG-- branch : product-engine
2010-05-12EXT-7203 FIXED Re-enabled inventory search for wearables panelPaul Guslisty
- 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
2010-05-12EXT-7204 FIXED added updating verbs and status (panel edit outfit) on base ↵Igor Borovkov
oufit changes --HG-- branch : product-engine
2010-05-07EXT-7165 FIXED panel outfit edit now observes all changes in COF (incl. ↵Igor Borovkov
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
2010-04-30Manual merge.Vadim Savchuk
By the way, removed "Add to outfit" and "Remove from outfit" buttons from the Edit Outfit panels. --HG-- branch : product-engine
2010-04-30Completed task EXT-6548 (Edit Outfit: correct XUI: update status string, add ↵Vadim Savchuk
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
2010-04-30additional patch for EXT-6732 Create specialized view of inventory for ↵Igor Borovkov
"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
2010-04-27partial implementation of EXT-6723 Create specialized view of inventory for ↵Igor Borovkov
"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
2010-04-23mergeIgor Borovkov
--HG-- branch : product-engine
2010-04-23completed EXT-6721 (Enable UI for user modification of wearable order)Igor Borovkov
- 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
2010-04-22Implemented EXT-6724(normal task) - Implement flat list view of filtered ↵Dmitry Zaporozhan
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
2010-04-20Fixed EXT-6930(normal) - Edit Outfit: "Add wearables" panel layout is broken.Dmitry Zaporozhan
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
2010-04-19completed EXT-6764 Implement filtering of wearables (combobox options: ↵Igor Borovkov
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
2010-04-19Update for major task EXT-6564 - Fix wearable editing panels.Dmitry Zaporozhan
Added temporary "edit" button to outfit list to allow QA test new wearable edit panels. Was not reviewed. --HG-- branch : product-engine
2010-04-14merge from PE's viewer-trunkTofu Linden
2010-04-13automated mergeLoren Shih
2010-04-13done EXT-6675 Fix TRASH btn on Edit Outfit panel to remove an item from ↵Igor Borovkov
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
2010-04-09done EXT-6688 Implement Revert button funtionality (Edit Outfit panel)Igor Borovkov
On revert the base outfit is worn Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/205/ --HG-- branch : product-engine
2010-04-09done EXT-6716 Implement Add button functionality for adding a wearable to ↵Igor Borovkov
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
2010-04-09mergeIgor Borovkov
--HG-- branch : product-engine
2010-04-09done EXT-6687 Implement Save button functionality (Edit Outfit panel)Igor Borovkov
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
2010-04-07fixes from automated mergeLoren Shih
2010-04-07automated mergeLoren Shih
2010-04-07PE merge from pe-viewer-trunkTofu Linden
2010-04-07(work in progress) EXT-6564(major) - Fix wearable editing panels.Dmitry Zaporozhan
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
2010-04-06EXT-6728 : Have LLInventoryFetchItems/DescendentsObserver inherit from a ↵Loren Shih
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.
2010-04-06EXT-6727 : Allow LLInventoryObservers to target a single item (instead of a ↵Loren Shih
vector of items) Added new constructors to LLInventoryFetch types to allow passing in a single item.
2010-04-06EXT-4151 : Immediately check if a fetchObserver filter is done, else add to ↵Loren Shih
observer list automatically FetchObservers now take in a list of IDs to check against. Made some naming changes.