summaryrefslogtreecommitdiff
path: root/indra/newview/llwearableitemslist.cpp
AgeCommit message (Collapse)Author
2011-02-08merge up to latest viewer-developmentOz Linden
2011-01-19STORM-348 FIXED "Edit" and "Lock" buttons appearing on body part items in ↵Vadim ProductEngine
outfit editor before they are hovered with mouse. Added buttons reshaping code that exists in postBuild() methods of the other LLPanelWearableListItem descendants.
2010-08-26Fix for bad merge error.Loren Shih
2010-08-26EXT-8751 FIXED "Create new" in Edit Outfit doesn't actually check if you can ↵Loren Shih
legally create a new item Create New now makes sure you haven't exceeded max wearables. Also took out debug camera hack.
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-23Created new wearable type.Loren Shih
Added debug setting for disabling physics. Added disable-multiwear and disable-camera-reset to wearabletype.
2010-08-19EXT-8635 FIXED Replaced "no matches found" with "Loading..." in the My ↵Andrew Dyukov
Outfits tab. Set no items text to "Loading..." when creating the wearable items list and to "There are no items in this outfit" when category is complete. "Outhfit" is there, because wearable items list nay be empty only for them. This string was introduced, because the only situation when there are no items shown in outfit tab is for empty outfit- because even when applying filter either all items from outfit will be shown or outfit tab won't be shown at all. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/865/ --HG-- branch : product-engine
2010-08-17(final?) hairy merge from viewer-release to viewer-publicTofu Linden
2010-08-16EXT-8636 FIXED updating wearables (worn) prefix in 'My Outfits' list.Sergei Litovchuk
- Fixed LLOutfitsList COF changes handler to update worn status of items removed from COF. Now they are updated based on the differences in original items' ids in COF. - Fixed 'My Outfits' items worn status check to update depending on whether the item is linked in COF or not. This is a kind of workaround to fix updating attachments' worn status because LLAppearanceMgr::updateAppearanceFromCOF is triggered erlier than new attachment links are fetched. When dumpItemArray(obj_items,"asset_dump: obj_item") is called from LLAppearanceMgr::updateAppearanceFromCOF, all attachment links have empty asset ids. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/859/. --HG-- branch : product-engine
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-09EXT-8577 FIXED Context menu items for multi-attachmentsVadim Savchuk
Changes: * Implemented bulk-add from My Appearance SP. * Made sure there's no memleak when you click Wear/Attach in the in-world object context menu and the callback isn't invoked (because e.g. avatar fails to get close enough to the object). I stated that in comments. Reviewed by Seraph at https://codereview.productengine.com/secondlife/r/844/ --HG-- branch : product-engine
2010-08-06EXT-8577 WIP Context menu items for multi-attachments.Vadim Savchuk
Done: - 1. Dropped the obsolete "MultipleAttachments" setting. - 2. Added an "Add" item to the following attachment-related context menus: * My Appearance (ex-My Outfits) context menu. * Edit Outfit -> Add More context menu. * Object in-world context menu. * Inventory context menu. * Object inspector gear menu. - 3. Modified "Attach To / Attach To HUD" to perform the "add" instead of "replace" action. TODO: - Ability to attach multiple objects at once from the Add More panel (bulk attach). - Make sure there's no memleak when you click Wear/Attach in the in-world object context menu and the callback isn't invoked (because e.g. avatar fails to get close enough to the object). Issues: 0. I'm not sure whether LLAgentWearables::userAttachMultipleAttachments() should replace attachments or add them. Assumed the former. 1. I couldn't verify that adding objects from the object inspector menu works because I either could wear an object or see its inspector, not both. 2. > 1. Right-click on an object in your inventory and select "Wear". > VERIFY: Attaches the object and replaces whatever's there; asks for > confirmation before replacing an existing object. I think this is impossible to implement because we don't know in advance what point the object will be attached to, so we can't display a confirmation dialog. Reviewed by Seraph at https://codereview.productengine.com/secondlife/r/843/ --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-28EXT-7015 ADDITIONAL FIX Updated condition of hiding wear related context ↵Alexei Arabadji
menu entries from "hide if all can't be worn" to "hide if any can't be worn". reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/813/ --HG-- branch : product-engine
2010-07-28merge from PE's viewer-trunkTofu Linden
2010-07-27Merge from dessie/viewer-releaseRichard Linden
2010-07-27Backed out changeset: 58571b4e704bRichard Linden
2010-07-27Performed necessary refactoring after merge rev. 14093:babb41195f70Alexei Arabadji
--HG-- branch : product-engine
2010-07-27Merge with head.Mike Antipov
Resolved conflict in indra/newview/lloutfitslist.cpp to use changes from viewer-release. Rejected changes in that file coming with 10f02c59761c (EXT-7015 FIXED Avoided wearing item moved to trash.) It will be refixed in a separate commit. --HG-- branch : product-engine
2010-07-27EXT-7015 FIXED Avoided wearing item moved to trash.Alexei Arabadji
Details: Disabled wear button and hidden related context menu entries if base object of inventory link is in trash. reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/806/ --HG-- branch : product-engine
2010-07-26Conflict resolution. Erring on the side of viewer-release.Tofu Linden
2010-07-26(hairy) merge from viewer-releaseTofu Linden
2010-07-23Fixed reversal of replace/add logic with clothingBrad Payne (Vir Linden)
2010-07-22merge from PE's viewer-releaseTofu Linden
2010-07-21EXT-8135 FIX - use LLUpdateAppearanceOnDestroy callback to postpone ↵Brad Payne (Vir Linden)
appearance update until all links are created
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-15Reverted changeset 2bb10eae42bfDessie Linden
2010-07-13Manual merge from default branchVadim Savchuk
Resolved conflicts in llpaneloutfitedit.cpp --HG-- branch : product-engine
2010-07-12EXT-8333 FIXED 'Add more': 'Wear' item remains enabled in context menu of ↵Loren Shih
worn object Simple logic fix so that worn objects son't have add/wear option.
2010-07-12Merge from default branchVadim Savchuk
--HG-- branch : product-engine
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-09merge from PE's viewer-releaseTofu Linden
2010-07-08Fix for EXT-8151Monroe Linden
Made LLPanelOutfitEdit::onPlusBtnClicked() iterate over all selected items and wear each one. Also made it create one LLUpdateAppearanceOnDestroy and pass it to all calls to wearItemOnAvatar. Add optional callback argument (as LLPointer) to wearItemOnAvatar, addCOFItemLink, LLDeferredCOFLinkObserver Reviewed by Nyx at http://codereview.lindenlab.com/2482033
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-08Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-07-05Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-07-03merge from PE's viewer-release. conflicts resolved.Tofu Linden
2010-07-02EXT-8213 FIX users cannot replace their shape if it does not loadNyx (Neal Orman)
Removed checking for wearables loaded on replacing or adding individual items. After reviewing the code in depth, we believe this is safe to do, particularly since we allow the user to replace their outfit from the same state. Filed a followup issue for later investigation EXT-8231 Code reviewed by Vir and Seraph
2010-07-02EXT-8127 FIXED Provided attachment list item name on outfit edit panel even ↵Alexei Arabadji
if it unworn. reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/688/ --HG-- branch : product-engine
2010-06-30EXT-8128 FIXED Right click menu should offer "wear" if no item of type is wornLoren Shih
2010-06-29EXT-7676 FIXED Added items sorting from gear menu for 'Add Wearable'.Sergei Litovchuk
- Added new gear menu when 'Add Wearable' panel is open in 'Edit Outfit'. - Added wearable items list comparator to sort by wearable creation date. - Added storing sorting type in viewer settings. Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/661/. --HG-- branch : product-engine
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-20 21:45:20 +0000