Commit Graph

69 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Nyx (Neal Orman) bb083dfca4 EXT-7958 FIX fixed shop button in the appearance sidepanel
updated icon, and fixed XUI so it displays properly.

Code reviewed by Monroe
2010-06-23 20:53:24 -04:00
Vladimir Pchelko c19dd3d2c4 EXT-7805 FIXED set tool_tip for "plus" button when body_part is selected in "Add more" panel (Edit Outfit)
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/626/

--HG--
branch : product-engine
2010-06-22 18:41:40 +03:00
Igor Borovkov baddb71549 EXT-7822 WIP changed the default plus button action from add to replace
Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/617

--HG--
branch : product-engine
2010-06-21 15:14:42 +03:00
Paul Guslisty 5fcdff3125 EXT-7797 FIXED Outfit Editor: Clicking fliter button should set focus in filter field
- Set focus on filter field

Reviewed by Mike Antipov and Neal Orman at https://codereview.productengine.com/secondlife/r/598/

--HG--
branch : product-engine
2010-06-21 14:34:08 +03:00
Mike Antipov 89825da530 EXT-7777 WIP Implemented loading indicator for "Save" and "Save As" actions in "My Outfits" & "Edit Outfit" Panels.
EXT-7929 FIXED Updated functionality of attaching object: loading indicator gets hidden when attaching is completed.

- Fixed crash when accessing singleton on application exit.

- Updated functionality of attaching object: loading indicator was not hidden.
 * Reason: link to attachment was created without next appearance updating.
 * Fix: passed "true" into LLAppearanceMgr::addCOFItemLink to call LLAppearanceMgr::updateAppearanceFromCOF when attachments is completed. (Like for clothing).

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/611/

--HG--
branch : product-engine
2010-06-18 17:28:32 +03:00
Andrew Polunin e460985ddf EXT-7639 FIXED added shop button which reacts according to the ticket description
- Added method LLAccordionCtrl::getExpandedTab() which search for the first expanded accordion tab. This method is a bit of hacking, but I discussed it with Vadim Savchuk.
- LLAccordionCtrlTab::isExpanded() is made 'const'. This is necessary to call it from getExpandedTab() which is also 'const'.
- Added all provided Marketplace URLs (taken from EXT-7257) to the settings.xml. So URLs can be configured without recompilation.
- Added method LLCOFWearables::getSelectedItems() which can be used to get ALL selected items (not only one).
- Class LLShopURLDispatcher is implemented in the llpaneloutfitedit.cpp.
- Added callback LLPanelOutfitEdit::onShopButtonClicked() which calls LLShopURLDispatcher to send user to the correct URL.
- Added shop button (shop_btn) widget in panel_outfit_edit.xml. It has invalid icon for now. After review I'm going to reassign the ticket to someone who will provide correct icons.

Reviewed by Vadim Savchuk and Mike Antipov at https://codereview.productengine.com/secondlife/r/569/

--HG--
branch : product-engine
2010-06-15 21:52:15 +03:00
Igor Borovkov e96544ff26 EXT-7742 FIXED panel outfit edit: added a separate dropdown for the list view
- added a separate filter combobox for the list view containing lots of items, all types of wearables, separated clothing and bodyparts items
- comboboxes are linked to the appropriate view, only one is shown
- got rid of excluding links in the folder view
- minor refactoring

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/573/

--HG--
branch : product-engine
2010-06-14 15:04:06 +03:00
Alexei Arabadji e22f4bb4e7 EXT-7613 FIXED Provided updating of base outfit name on outfit rename event.
1 Updated LLOutfitObserver to provide controlling of changing outfit name.
2 Added call of LLPanelOutfitEdit::updateCurrentOutfitName to LLPanelOutfitEdit::updateVerbs since both should be called on BOFChanged signal.
3 Corrected updating field LLOutfitObserver::mBaseOutfitLastVersion.

reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/553/

--HG--
branch : product-engine
2010-06-10 14:43:28 +03:00
Igor Borovkov 92807a6fe2 EXT-7671 FIXED assigned appropriate callback for second Gear menu (panel outfit edit)
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/542/

--HG--
branch : product-engine
2010-06-10 12:50:30 +03:00
Igor Borovkov 206aab29dc EXT-7577 FIXED added filtering add wearables panel (list and folder views) according to the current user's selection
- added filtering add wearables panel (list and folder views) according to the current user's selection (rules for showing a particular view and setting a particular filtering are specified in the table at https://jira.secondlife.com/browse/EXT-7577)
- minor refactoring

Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/534/

--HG--
branch : product-engine
2010-06-09 15:48:48 +03:00
Vadim Savchuk d17b616b1c EXT-7627 FIXED Wearing an item now doesn't open the wearable editing panel.
Fix:
- Save the UUID of a newly created wearable to start editing it right after it gets worn.
  This approach replaces a temporary hack that invoked the editing panel whenever an item gets worn
  (if the Appearance SP is opened at the time).
  The hack only happened to work sometimes because the editing panel failed to open.

Other changes:
- Removed a check for inventory item completeness from LLAgentWearables::editWearable().
  because the check often fails and doesn't appear to be needed at all.
- Added warning messages to LLAgentWearables::editWearable() so that it's easier to debug.
- Replaced duplicated code in LLPanelOutfitEdit::onEditWearableClicked() with a call to gAgentWearables.editWearable().

Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/529/

--HG--
branch : product-engine
2010-06-08 17:01:29 +03:00
Alexei Arabadji 50eb27a04d EXT-7644 FIXED Implemented functionality for locking outfit modification 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-08 15:36:48 +03:00
Igor Borovkov bff974cdb8 EXT-7406 FIXED extended find wearables of type functor to filter out links (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-07 12:10:36 +03:00
Alexei Arabadji f99a601dbe EXT-7485 FIXED Provided update of 'save as' button status and save outfit 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-04 14:58:48 +03:00
Mike Antipov 07ca580cfa EXT-7503 WIP Made first inventory fetch for Add to Outfit panel on the first 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-03 13:59:28 +03:00
Mike Antipov b52527de3a merge
--HG--
branch : product-engine
2010-06-03 12:53:54 +03:00
Mike Antipov 5459e26392 EXT-7503 WIP Made first inventory fetch for Add to Outfit panel on the first 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-03 12:47:18 +03:00
Vadim Savchuk 142a6c3b8f EXT-6726 WIP Added missing menu items to the Appearance SP.
- 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-02 20:46:16 +03:00
Igor Borovkov a543a1276e EXT-7527 FIXED repositioned "Add more..." button (panel edit outfit)
- 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-06-01 17:24:35 +03:00
Sergei Litovchuk b3c1e9cd75 EXT-7201 FIXED Removed extra gear menu button.
- 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-31 22:20:17 +03:00
Vadim Savchuk 4b8c269d94 merge; fixed gcc build
--HG--
branch : product-engine
2010-05-31 16:57:39 +03:00
Vadim Savchuk 39eb49c5f4 Manual merge from default branch.
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-31 16:18:22 +03:00
Paul Guslisty aac23d2d1e EXT-7472 ADDITIONAL FIX Added panel switching from Tree List View to Flat 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-31 16:16:45 +03:00
Alexei Arabadji bfced6d4c1 EXT-7485 FIXED Updated 'save as new' button on inventory outfit pane to fit 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-31 15:55:08 +03:00
Nyx (Neal Orman) 285c4c47f5 EXT-7505 FIX stuck in appearance edit mode if close appearance sidebar
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-28 16:20:00 -04:00
Paul Guslisty d42fd6cf7f EXT-7472 FIXED Open add to outfit panel by (+) button click on unwearable 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-28 20:10:10 +03:00
Vadim Savchuk d634239bac EXT-6726 WIP Added stubs for most of Appearance SP context/gear menus.
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-20 14:54:34 +03:00
Igor Borovkov 1d4b26832c EXT-7331 FIXED added updating the title (panel outfit edit) on replacing/wearing outfit externally (my inventory)
Reviewed by Neal Orman and Mike Antipov

--HG--
branch : product-engine
2010-05-21 13:44:42 +03:00
Andrew Dyukov 49a79a3f68 EXT-7200 FIXED Integrated art missing from appearance.
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-20 14:31:31 +03:00
Vadim Savchuk 7f4680c8c2 merge
--HG--
branch : product-engine
2010-05-19 14:07:56 +03:00
Vadim Savchuk 9aacdbc155 EXT-7242 FIXED Added a new "Edit my Shape" link to avatar self-click context 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-19 14:03:29 +03:00
Igor Borovkov cfd5657202 EXT-7234 FIXED whether folder view or list view is currently used is decided 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-19 13:46:03 +03:00
Andrew Polunin bf197d4f41 EXT-7199 FIXED (Enable dragging items from inventory view to current outfit 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-17 16:52:44 +03:00
Igor Borovkov 1b41e68636 EXT-7243 FIXED assigned a callback to the add_to_outfit_btn (panel outfit edit)
Reviewed by Vadim Savchuk and Neal Orman at https://codereview.productengine.com/secondlife/r/380

--HG--
branch : product-engine
2010-05-13 13:12:59 +03:00
Paul Guslisty bc9b15a348 EXT-7203 FIXED Re-enabled inventory search for wearables panel
- 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-12 17:38:07 +03:00
Igor Borovkov 36e84baea4 EXT-7204 FIXED added updating verbs and status (panel edit outfit) on base oufit changes
--HG--
branch : product-engine
2010-05-12 13:47:14 +03:00
Igor Borovkov f00aad0123 EXT-7165 FIXED panel outfit edit now observes all changes in COF (incl. 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-05-07 13:17:11 +03:00
Vadim Savchuk 9fda462330 Manual merge.
By the way, removed "Add to outfit" and "Remove from outfit" buttons from the Edit Outfit panels.

--HG--
branch : product-engine
2010-04-30 19:05:46 +03:00
Vadim Savchuk 66e407c1ca Completed task EXT-6548 (Edit Outfit: correct XUI: update status string, add 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-30 17:04:24 +03:00
Igor Borovkov 702efd72ab additional patch for EXT-6732 Create specialized view of inventory for "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-30 15:59:23 +03:00
Igor Borovkov 2696e37509 partial implementation of EXT-6723 Create specialized view of inventory for "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-27 15:23:07 +03:00
Igor Borovkov 5405bf10cd merge
--HG--
branch : product-engine
2010-04-23 14:45:27 +03:00
Igor Borovkov 181315db32 completed EXT-6721 (Enable UI for user modification of wearable order)
- 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-23 14:35:24 +03:00
Dmitry Zaporozhan b15e2beabf Implemented EXT-6724(normal task) - Implement flat list view of filtered 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-22 15:48:48 +03:00
Dmitry Zaporozhan f260d52c75 Fixed EXT-6930(normal) - Edit Outfit: "Add wearables" panel layout is broken.
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-20 13:46:43 +03:00
Igor Borovkov 71c7b2f6d7 completed EXT-6764 Implement filtering of wearables (combobox options: 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-19 13:23:24 +03:00
Dmitry Zaporozhan b42efcfee3 Update for major task EXT-6564 - Fix wearable editing panels.
Added temporary "edit" button to outfit list to allow QA test new wearable edit panels.
Was not reviewed.

--HG--
branch : product-engine
2010-04-19 13:00:12 +03:00
Tofu Linden 13fdc6e458 merge from PE's viewer-trunk 2010-04-14 09:46:37 +01:00
Loren Shih 85f54aca0f automated merge 2010-04-13 16:39:12 -04:00
Igor Borovkov 613b4e9361 done EXT-6675 Fix TRASH btn on Edit Outfit panel to remove an item from 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-13 13:37:14 +03:00