summaryrefslogtreecommitdiff
path: root/indra/newview/llcofwearables.cpp
AgeCommit message (Collapse)Author
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-13Change license from GPL to LGPL (version 2.1)Oz 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-02merge from dessie/viewer-releaseRichard Nelson
2010-08-02Redo the same merge as in changeset "2026f824953f", but this time with ↵Christian Goetze (CG)
feeeeling.
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-30mergeRichard Nelson
2010-07-30changed to use childSetAction without void* argumentRichard Nelson
2010-07-27Merge from dessie/viewer-releaseRichard Linden
2010-07-26Conflict resolution. Erring on the side of viewer-release.Tofu Linden
2010-07-26(hairy) merge from viewer-releaseTofu 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-20mergeRichard Nelson
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-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-10merge from PE's viewer-releaseTofu Linden
2010-07-09mergeRichard Linden
2010-07-09EXT-8237 FIX Opening up Edit Outfit- Add More->Shirt causes FPS to drop from ↵Richard Linden
60fps to 18fps for a really long time EXT-8235 FIX HUGE long delay when reopening and/or closing edit outfit sidepanel if "Add More..." is active EXT-7695 FIX UI lockup after add wearable, right click av -> Change Outfit reviewed by Vir
2010-07-09EXT-7786 FIXED COF Wearables List is updated only when visible (panel outfit ↵Igor Borovkov
eidt) Every single delete/create operation in the COF causes LLCOFWearables to be updated - on each update its contained LLFlatListView is repopulated. That means massive creation of LLPanel's instances (LLUICtrlFactory::buildPanel(...)). Half of the panel creation time is spent in the EXPAT xml library on parsing the .xml files of the panel item. I've forbidden updates of LLCOFWearables when Panel Outfit Edit is not in the visible chain. Panel Outfit Edit is now updated only when it is visible Also LLCOFWearables refures to refresh its content if COF category version hasn't been changed since the last refresh. Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/715 --HG-- branch : product-engine
2010-07-08EXT-8170 ADDITIONAL FIX Now using complete translatable sentences like ↵Vadim Savchuk
"Create new shoes", "Create new pants", etc as labels for AE context menus. Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/716/ --HG-- branch : product-engine
2010-07-08EXT-8061 FIXED refactoring, added a mapping for According Tab > Asset Type ↵Igor Borovkov
(COF Wearables) Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/704/ --HG-- branch : product-engine
2010-07-07EXT-8170 FIXED Fixed clothing context menu localization in Edit Outfit.Vadim Savchuk
- Localized the "New Shoes" string. I'm sceptical about this fix. Let's see if the translation team accepts it. If not, I'll add a bunch of new translatable strings like "Create new shoes", "Create new pants", etc. - Translated the "Replace" item of clothing context menu (took translation from the body part context menu). Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/710/ --HG-- branch : product-engine
2010-07-06EXT-8061 FIXED resetting selection inside accordion (panel outfit edit)Igor Borovkov
- added resetting lists selection on tabs state changes - added committing on tab selection change - added filtering wearables by at first by a selected tab and then by an expended tab Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/696 --HG-- branch : product-engine
2010-07-02EXT-8145 FIXED disabled committing on selection change when list's selection ↵Igor Borovkov
is restored (panel edit outfit) turning off committing on selection change for the COF Wearables flat lists while restoring selection between refreshes/updates Reviewed by Vadim Savchuk and Neal Orman at https://codereview.productengine.com/secondlife/r/683/ --HG-- branch : product-engine
2010-07-01EXT-8158 FIXED Replaced toggling with show functionality of outfit edit panel.Alexei Arabadji
reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/677/ --HG-- branch : product-engine
2010-06-25EXT-7914 FIXED (Update context menu for worn clothing in the Edit Outfit panel)Andrew Polunin
- Removed the following menu items: Move Up a Layer, Move Down a Layer. - Added 'Replace' menu item. - Implemented method replaceWearable() - handler for the 'Replace' menu item. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/642/ --HG-- branch : product-engine
2010-06-24EXT-7963 FIXED Edit Outfit > Add More > Do not switch to next item type ↵Paul Guslisty
after add/replace - Added callback to wear item from Add More panel on doubleclick - To keep the list in its existing state and do not change the contents of the Add More panel to the next listed unworn item after the user wears an item, check if the item is not dummy. Dummy icons have no ids. Reviewed by Mike Antipov and Neal Orman at https://codereview.productengine.com/secondlife/r/647/ --HG-- branch : product-engine
2010-06-24EXT-7975 FIX Didn't show menu if there is no work clothing among selected itemsYuri Chebotarev
reviwed by Neal Orman at https://codereview.productengine.com/secondlife/r/635/ --HG-- branch : product-engine
2010-06-17EXT-7903 FIXED Disabled "Edit" context menu option for multi selection in ↵Vadim Savchuk
the Outfit Editor. Trivial fix, not reviewed. --HG-- branch : product-engine
2010-06-16EXT-7693 ADDITIONAL FIX Added assertion in the type_map to make sure xml and ↵Andrew Polunin
code are in sync --HG-- branch : product-engine
2010-06-15EXT-7639 FIXED added shop button which reacts according to the ticket ↵Andrew Polunin
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-09EXT-7611 FIXED Enabled the "Create new [TYPE]" context menu item for ↵Vadim Savchuk
non-worn items in the outfit editor. Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/535/ --HG-- branch : product-engine
2010-06-04EXT-7511 FIXED Resolved problem with cropping of item selection bottomAndrew Dyukov
Problem reproduced for items which had divider at the bottom. It was caused by non-optimal placement of divider in item. To fix this, "top" attribute of divider was changed, and when done so it turned out that increase of items height from implementation of this task was not necessary, so rolled back these changes in xml and code. Also added some padding between flatlists items to avoid cropping of top part of item selection because of divider. Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/502/ --HG-- branch : product-engine
2010-06-04EXT-7575 FIXED appended attachment location after name in parenthesis.Igor Borovkov
Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/514 --HG-- branch : product-engine
2010-06-03EXT-7511 FIXED Fixed problems in appearance UIAndrew Dyukov
- Made slight changes in xml according to requirements. - Added mForceNoLinksOnIcons bool member to LLPanelInventoryListItemBase. It is used in LLPanelWearableListItem to disable showing of link icons as was requested in ticket. - Created icon for divider 3 pixels high as asked by Erica in EXT-7233. To properly show and hide it made changes to LLCOFWearables::buildClothingListItem which now not only showes separator but also reshapes panel depending on its visibility. Increased heights of body parts, dummy clothing and attachment items because dividers are now 2 pxls higher and they always have dividers. Changed heights of buttons accordingly. Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/502/ --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-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-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-28CID-477Tofu Linden
Checker: NULL_RETURNS Function: LLCOFWearables::buildClothingListItem(LLViewerInventoryItem *, bool, bool) File: /indra/newview/llcofwearables.cpp
2010-05-28CID-478Tofu Linden
Checker: NULL_RETURNS Function: LLCOFWearables::buildBodypartListItem(LLViewerInventoryItem *) File: /indra/newview/llcofwearables.cpp
2010-05-25EXT-6726 WIP Added handlers for most of Appearance SP context/gear menus.Vadim Savchuk
Reviewed by Mike Antipov and Nyx at https://codereview.productengine.com/secondlife/r/428/ --HG-- branch : product-engine