summaryrefslogtreecommitdiff
path: root/indra/newview/llpaneloutfitedit.cpp
AgeCommit message (Collapse)Author
2010-10-25apply fixes for STORM-341, not quite a transplantKent Quirk
2010-09-16mergeRichard Linden
2010-09-01merge VWR-22724 FIXED Clicking an attachment switched the Add More inventory ↵Tofu Linden
to Flat view
2010-08-31VWR-22724 FIXED Clicking an attachment switched the Add More inventory to ↵Paul Guslisty
Flat view Added checking when item in COF list selected: IF (FolderListView is shown) THEN (don't switch to the FlatListView AND set proper filter for FlatListView). Reviewed by Vadim Savchuk
2010-08-31VWR-22723 Add More category picker defaults whenever a clothing item is removedPaul Guslisty
- After wearable removed from COF list, check: whether any outfit of the same wearable type as removed left in COF. If left then select it. - Added method selectClothing(LLWearableType::EType) to the LLCOFWearables that selects first clothing from COF of specified WearableType Reviewed by Vadim Savchuk
2010-08-27Post-convert merge by convert_monolith.py from ./viewer-experienceMonroe Linden
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
back-out the back-out for this branch. yay.
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24merge heads. whew.Tofu Linden
2010-08-16cleaned up LLUICtrlFactory...Richard Nelson
removed redundant functionality moved buildPanel to LLPanel
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-08-12Fix a bunch of typos in new enums, one of which was causing a build failure.Tofu Linden
2010-08-12merge from viewer-releaseTofu Linden
2010-08-12EXT-8205 FIXED (Items in \"Add more\" panel are not sorted by name)Paul Guslisty
- Modified LLWearableItemTypeNameComparator so that it can be more reusable and adjustable - Set LLWearableItemTypeNameComparator for WearableItemsList ('List view' of 'Add More' panel) due to sort clothings by name - Modified and applied patch form https://codereview.productengine.com/secondlife/r/620/diff/2/#index_header. This patch was discarded because specification was changed Restored diff after bad merge at 13817 Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/765/ --HG-- branch : product-engine
2010-08-07merge from viewer-releaseTofu Linden
2010-08-06EXT-7963 FIXED (Edit Outfit > Add More > Do not switch to next item type ↵Paul Guslisty
after add/replace) - Added selected item type (in flat list view) as criterion when determining filter type in 'Add More' panel - Fixed LLAccordionCtrl::getSelectedTab() method. When 'selection_enabled = false' for LLAccordionCtrlTab, LLAccordionCtrl::getSelectedTab() returned NULL, even if some accordion tab was selected. Now it's OK. Method returns currently selected LLAccordionCtrlTab. Recovered from bad merge in 13811 Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/790/ --HG-- branch : product-engine
2010-08-05fix a merge conflict I forgot to commit earlier.Tofu Linden
2010-08-05(hairy) merge from viewer-releaseTofu Linden
2010-08-04EXT-8283 FIX, EXT-8360 FIX - original fixes got broken, presumably during ↵Brad Payne (Vir Linden)
some merge
2010-08-04merge from viewer-releaseTofu Linden
2010-08-04EXT-8284 FIXED ('Add More' panel items aren't sorted by clothing type after ↵Paul Guslisty
it was opened by 'Replace' item of context menu) Restored from BAD MERGE at 5b5cc4a8642d Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/750/ --HG-- branch : product-engine
2010-08-02Redo the same merge as in changeset "2026f824953f", but this time with ↵Christian Goetze (CG)
feeeeling.
2010-08-02EXT-7676 FIXED Restored fix (47df1b3fd94e) reverted in merge 5b5cc4a8642d ↵Sergei Litovchuk
with slight modifications. - Replaced pointers passed to 'Add More' gear menu with LLHandle. - Removed storing 'Add More' panel sort order from settings because the order is changed each time the panel opens. - Replaced creating items comparator in LLPanelOutfitEdit::postBuild() with a static comparator in llwearableitemslist.cpp. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/826/. --HG-- branch : product-engine
2010-07-30Merge from q/viewer-release to dessie/viewer-release for 2.1.1 beta 1Kent Quirk
2010-07-27Backed out changeset: 58571b4e704bRichard Linden
2010-07-27EXT-8491 FIXED Crash in LLAppearanceMgr::addCOFItemLink().Vadim Savchuk
Reason: When you click on a clothing link in COF, LLAppearanceMgr::wearItemOnAvatar() removes all COF links of the clicked wearable type -- thus invalidating all previously obtained LLViewerInventoryItems for those links -- and then passes such an invalid item (item_to_wear) to addCOFItemLink() which of course crashes. Fix: 1. Handle this case in wearItemOnAvatar(): don't try wearing COF items. 2. Disable the Wear button in the inventory SP when a COF item is selected. 3. Fixed get_can_item_be_worn() to return FALSE for items which are in COF or have links in COF. Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/811/ --HG-- branch : product-engine
2010-07-26EXT-7963 FIXED (Edit Outfit > Add More > Do not switch to next item type ↵Paul Guslisty
after add/replace) - Added selected item type (in flat list view) as criterion when determining filter type in 'Add More' panel - Fixed LLAccordionCtrl::getSelectedTab() method. When 'selection_enabled = false' for LLAccordionCtrlTab, LLAccordionCtrl::getSelectedTab() returned NULL, even if some accordion tab was selected. Now it's OK. Method returns currently selected LLAccordionCtrlTab. Reviewed by Mike Antipov, Neal Orman and Richard Nelson at https://codereview.productengine.com/secondlife/r/790/ --HG-- branch : product-engine
2010-07-26EXT-8329 FIXED Provided disabling 'Wear Item' button after item was worn.Alexei Arabadji
Details: 1 Updated condition is item can be worn considering situation when item is copied in COF but is not worn. 2 Avoided code duplication in method LLOutfitsList::canWearSelected() reviewed by Vadim Savchuk and Neal Orman at https://codereview.productengine.com/secondlife/r/785/ --HG-- branch : product-engine
2010-07-30mergeRichard Nelson
2010-07-30deprecated LLPanel::child*() methodsRichard Nelson
2010-07-29EXT-7406 RE FIXED Replaced inventory collector for objects to exclude links ↵Mike Antipov
from the Edit Outfit->Add More panel. Restored fix that was previosly committed in 76bd52803506 and then somewhy reverted in 5b5cc4a8642d. --HG-- branch : product-engine
2010-07-29EXT-7565 FIXED RECOVER FROM BAD MERGE (Would be nice to preserve selection ↵Paul Guslisty
while switching between folder/list view modes) Added missed (during bad merge 14077:5b5cc4a8642d) code to the llpanloutfitedit(.h/.cpp): recover LLPanelOutfitEdit::updateWearablesPanelVerbButtons() and LLPanelOutfitEdit::saveListSelection() methods Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/817/ --HG-- branch : product-engine
2010-07-28merge from viewer-releaseTofu Linden
2010-07-27Merge from dessie/viewer-releaseRichard Linden
2010-07-21EXT-8164 FIXED (Accordions should be reset to default state after Edit ↵Andrew Polunin
Outfit panel reopening) Now accordion on panels 'Edit Outfit', 'Editing Shape', 'Editing Hair', 'Editing Eyes', 'Editing Skin', 'Group Profile' and 'Place Profile' are reset when the panels are closed and then opened again. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/782/ --HG-- branch : product-engine
2010-07-21EXT-8205 FIXED (Items in \"Add more\" panel are not sorted by name)Paul Guslisty
- Modified LLWearableItemTypeNameComparator so that it can be more reusable and adjustable - Set LLWearableItemTypeNameComparator for WearableItemsList ('List view' of 'Add More' panel) due to sort clothings by name - Modified and applied patch form https://codereview.productengine.com/secondlife/r/620/diff/2/#index_header. This patch was discarded because specification was changed Reviewed by Mike Antipov and Vadim Savchuk at https://codereview.productengine.com/secondlife/r/765/ --HG-- branch : product-engine
2010-07-20mergeRichard Nelson
2010-07-20mergeBrad Payne (Vir Linden)
2010-07-20EXT-8360 FIX - cleanupBrad Payne (Vir Linden)
2010-07-19EXT-8360 WIP - propagating COF item name changes various placesBrad Payne (Vir Linden)
2010-07-16EXT-7639 FIXED (Make shop button open different URLs depending on what is ↵Andrew Polunin
selected in outfit editor) - 'Add More' panel multiple selection behavior Implemented the following behavior: \"if multiple selection is made in the Add More panel then default marketplace home URL can be used\". Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/769/ --HG-- branch : product-engine
2010-07-15Reverted changeset 2bb10eae42bfDessie Linden
2010-07-15EXT-8284 FIXED ('Add More' panel items aren't sorted by clothing type after ↵Paul Guslisty
it was opened by 'Replace' item of context menu) - Set proper callback for 'Replace' clothing - Renamed onReplaceBodyPartMenuItemClicked to onReplaceMenuItemClicked because now this callback is used not only for Body Parts but for clothing also - Added argument 'const LLUUID& item_id' for 'static void replaceWearable()' to be able to call onReplaceMenuItemClicked with LLUUID argument Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/750/ --HG-- branch : product-engine
2010-07-15merge from PE's viewer-trunk (viewer-public)Tofu Linden
2010-07-13Manual merge from default branchVadim Savchuk
Resolved conflicts in llpaneloutfitedit.cpp --HG-- branch : product-engine
2010-07-13EXT-8329 FIXED added updating Plus button on COF changesIgor Borovkov
added updating Plus button (Wear Item button) on COF changes (only when Edit Outfit panel is trully visible) Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/742/ --HG-- branch : product-engine
2010-07-13EXT-7639 FIXED (Make shop button open different URLs depending on what is ↵Andrew Polunin
selected in outfit editor) - Fixed old market place URL to the new one in the settings.xml. - Implemented the following feature: \"When Add More panel in focus selection inside it should supersede selection in accordions\". To achieve this: -- LLPanelOutfitEdit::getCOFWearablesSelectionType() function was implemented. -- LLPanelOutfitEdit::getAddMorePanelSelectionType() function was implemented. -- LLPanelOutfitEdit::getWearableTypeByItemUUID(const LLUUID& item_uuid) function was implemented. -- LLPanelOutfitEdit::onShopButtonClicked() was rewritten to use those functions. - Fixed the problem with shop button and gender: now shop button for male leads to male links. Reviewed by Vadim Savchuk and Neal Orman at https://codereview.productengine.com/secondlife/r/725/ --HG-- branch : product-engine
2010-07-13EXT-8180 FIXED resetting wearable items list position to top on "Add More" ↵Sergei Litovchuk
panel opening. Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/680/. --HG-- branch : product-engine
2010-07-12Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-07-09EXT-7406 FIXED excluded inventory links from Add More list view (panel ↵Igor Borovkov
outfit edit) Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/723 --HG-- branch : product-engine
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 15:16:01 +0000