summaryrefslogtreecommitdiff
path: root/indra/newview/llappearancemgr.cpp
AgeCommit message (Collapse)Author
2010-08-13merge from viewer-releaseTofu Linden
2010-08-12EXT-8629 FIXED Enable the Wear button in My Outfits for outfits that are ↵Vadim Savchuk
subsets of the current outfit. We allowed wearing any outfit that contains non-worn items. Now it appears to be wrong, therefore and I changed condition so that we allow wearing any outfit (or folder) that contains the full set of body parts. Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/855/ --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-04merge from viewer-releaseTofu Linden
2010-08-03EXT-8534 FIXED Fixed the 'Wear' in My Outfits being disabled for outfits ↵Vadim Savchuk
consisting of body parts only. Changed the condition to enable the "Wear" button in My Outfits and the corresponding item in the outfit context menu. They now get enabled for any outfit that isn't the base outfit and contains non-worn wearables. By the way, did a minor cleanup: moved an LLAgentWearables.isCOFChangeInProgress() call to LLAppearanceMgr::getCanAddToCOF() to avoid code duplication. Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/832/ --HG-- branch : product-engine
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-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-26merge from PE's viewer-releaseTofu Linden
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-23Removed a bunch of templates and inlining through the miracle of boost::functionBrad Payne (Vir Linden)
2010-07-22EXT-8153 FIX - modified replace logic when wearing multiple itemsBrad Payne (Vir Linden)
2010-07-28merge from viewer-releaseTofu Linden
2010-07-27Merge from dessie/viewer-releaseRichard Linden
2010-07-21EXT-8135 FIX - use LLUpdateAppearanceOnDestroy callback to postpone ↵Brad Payne (Vir Linden)
appearance update until all links are created
2010-07-19EXT-8360 WIP - propagating COF item name changes various placesBrad Payne (Vir Linden)
2010-07-15Reverted changeset 2bb10eae42bfDessie Linden
2010-07-13merge from PE's viewer-releaseTofu Linden
2010-07-12EXT-8151 FIX multi-selection breakageNyx (Neal Orman)
Original patch merged poorly with a coverity cleanup, resulting in us not passing the callback on to the proper functions for clothing (we did for bodyparts). Added the callback and wearing clothing works again! Code reviewed by Monroe
2010-07-10EXT-8190 PARTIAL FIX Fixed loading indicator infinite spins upon pressing ↵Sergei Litovchuk
'Save' for outfit with non-link items. - Added inventory collector functor to select items by their actual type. - Fixed outfit "dirtiness" calculation so only link items are checked. Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/728/. --HG-- branch : product-engine
2010-07-08Automated merge with ssh://hg.lindenlab.com/q/viewer-release/Nyx (Neal Orman)
2010-07-08EXT-8279 FIX original items being deleted when removed from COFNyx (Neal Orman)
Replacing logic with call to removeCOFItemLinks, which should do appropriate checking to determine that item is in the COF and is actually a link. Code reviewed by Seraph
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-08merge from PE's viewer-publicTofu Linden
2010-07-07mergeBrad Payne (Vir Linden)
2010-07-07SNOW-704 EXT-8267 FIX Crash on login for invalid inventory wearable type dataNyx (Neal Orman)
Used to assert that the inventory's stored wearable type data matched the asset's stored wearable type, leading to a crash when these did not line up. Converted the assert to a check with llwarns for when this happens. code reviewed by vir
2010-07-07EXT-8234 FIX - reduced log spam quite a bit; rest is arguably still useful ↵Brad Payne (Vir Linden)
for diagnosing the not-uncommon problems encountered during outfit changes
2010-07-07EXT-8154 FIXED Forced removing garbage items from COF.Alexei Arabadji
reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/687/ --HG-- branch : product-engine
2010-07-06EXT-8249 FIX coverity fix - eliminating fallthrough for switch statementNyx (Neal Orman)
Code reviewed by Seraph
2010-07-05CID-499Tofu Linden
Checker: FORWARD_NULL Function: LLAppearanceMgr::dumpItemArray(const LLDynamicArray<LLPointer<LLViewerInventoryItem>, (int)32> &, const std::basic_string<char, std::char_traits<char>, std::allocator<char>>&) File: /indra/newview/llappearancemgr.cpp
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-01mergeBrad Payne (Vir Linden)
2010-07-01EXT-8194 FIX - added textures for default avatar wearables and attachmentsBrad Payne (Vir Linden)
2010-06-30Automated merge with ssh://hg.lindenlab.com/q/viewer-release/Nyx (Neal Orman)
2010-06-30Cleanup - moved small utility classBrad Payne (Vir Linden)
2010-06-30EXT-8115 FIX outfits saved under 2.0 load with "unsaved changes"Nyx (Neal Orman)
Added code to save order information to outfits on loading / reverting them. Order information is updated not only in COF, but also in base outfit folder. This is only safe to do when we are explicitly loading a saved outfit, as the COF may have deviated from the saved outfit. This will also help fix order discrepencies in saved outfits that have been manually modified through inventory operations. Fix will only be effective after server 1.40 has rolled out. Tested results on Aditi to verify effectiveness. Code Reviewed by Seraph
2010-06-29EXT-8063 FIX, EXT-7986 FIX - enforce wearable counts in ↵Brad Payne (Vir Linden)
updateApperanceFromCOF() if UI lets any improper state through
2010-06-28EXT-8063 WIP - last-ditch filtering of item counts in updateAppearanceFromCOFBrad Payne (Vir Linden)
2010-06-24EXT-7777 FIXED reverted changes to show loading indicator for "Wear/Attach" ↵Mike Antipov
action. Because it was too hard to fix EXT-7949 having so extremly lack of time. Proper fix for EXT-7949 requires changes in different places of the code calling add/removeCOFItemLink(). Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/644/ --HG-- branch : product-engine
2010-06-11EXT-7779 FIXED Changed wearing panel from inventory panel to a flat list ↵Sergei Litovchuk
similar to My Outfits view. - Added common interface for My Outfits and Wearing tabs. - Changed LLPanelOutfitsInventory to use common interface for My Outfits and Wearing tabs. - Removed dependency on outfits side panel from inventory bridge context menus. - Removed unused LLShowCreatedOutfit class from llagentwearables.cpp. - Restored opening newly created outfit in My Outfits tab. - Fixed worn items indication for Wearing tab items. Revieved by Neal Orman at https://codereview.productengine.com/secondlife/r/604/. --HG-- branch : product-engine
2010-06-23EXT-7755 ADDITIONAL FIX Fixed issues with wrong title after an outfit from ↵Mike Antipov
the Inventory is worn, "Wear..." menu items state is made consistent with "Wear" button. * Empty string is replaced with "Changing outfits" while changing COF; * Fixed title to show "No Outfit" after an outfit from the Inventory is worn; * Fixed bug with visible indicator after an empty folder is DnD from the Inventory "Clothing" * Updated context and Gear "Wear..." menu items to take into account "isCOFChangeInProgress" state in on_enable callbacks Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/625/ --HG-- branch : product-engine
2010-06-21mergeBrad Payne (Vir Linden)
2010-06-21EXT-4919 WIP - fixed problems with inventory fetch failing to time out, ↵Brad Payne (Vir Linden)
added copying/activation of more gesture folders
2010-06-18EXT-7777 WIP Implemented loading indicator for "Save" and "Save As" actions ↵Mike Antipov
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-17EXT-7722 Fixed "Add to COF" and "Remove from COF" outfit context menu items ↵Vadim Savchuk
to be enabled when appropriate and work properly. Work on "Take Off - Remove from Current Outfit" and "Wear - Add to Current Outfit" menu options: - The menu items of the outfit context menu and the My Outfits gear menu are now disabled when inappropriate instead of being hidden. - The menu items get enabled/disabled depending on whether you can wear (take off) anything from the selected outfit. (was: depending on whether you're wearing the outfit) - Changed the way the options work: they now only operate on clothes and attachments. "Add to COF" now only adds those body parts that are missing in COF; "Remove from COF" doesn't touch body parts at all. Without this change both "Add" and "Remove" options would be available simultaneously, because any valid outfit contains body parts. I think that would be confusing. And you don't expect you body parts to be replaced when doing "Add to COF'. (that's addition, not replacement) Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/585/ --HG-- branch : product-engine
2010-06-17EXT-7777 WIP Added several cases to show Loading indicator in "My Outfits:"Mike Antipov
* Outfit is loading for the first time * After user clicks: ** Item Context menu > Add ** Item Context menu > Replace Known Issues: 1. For multi-wearable indicator will disappear after first item from the batch is worn. Did not fix this to not affect the stability before 2.1 release. 2. To show loading indicator first time we have to notify subscribers of LLAgentWearables. For now this is done from the deprecated LLAgentWearables::processAgentInitialWearablesUpdate Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/602/ --HG-- branch : product-engine
2010-06-16mergeBrad Payne (Vir Linden)
2010-06-16EXT-6571 FIX - avoid removing links to missing wearables, which fixes a ↵Brad Payne (Vir Linden)
problem with ordering in multi-wearables
2010-06-15EXT-7468 FIXED Remove all 2.1 COF debugging codeLoren Shih
#ifdef'd a couple more llinfos spam to not show up in release mode.