summaryrefslogtreecommitdiff
path: root/indra/newview/llappearancemgr.cpp
AgeCommit message (Collapse)Author
2011-10-15Automated merge with http://hg.secondlife.com/viewer-developmentRichard Linden
2011-10-12EXP-625 Speed up initial outfit copy and avatar bake by moving initial ↵Aaron Stone
gesture copy to LLAppearangeMgr::onFirstFullyVisible().
2011-09-29EXP-1209 FIXED Sidetray removed.Paul ProductEngine
- Removed all sidetray dependencies and the sidetray itself. - Also removed LLFloaterSidetrayTab and LLSidetrayListener as unused.
2011-09-27EXP-1226 FIXED (Create and register a floater for Appearance side tab)Paul ProductEngine
- Added xml for a new floater Appearance and registred it in the floaterreg - Removed side tray dependencies - Added static helper method: LLFloaterSidePanelContainer::getPanel
2011-09-12Removed windows line endings to conform to coding policy.Leslie Linden
2011-08-26EXP-1162 FIX We are failing to create the Outfit links from the library ↵Richard Nelson
initial outfits copied on first login reviewed by Stone
2011-05-02mergeDave Parks
2011-04-18EXP-628 Inventory floater may be opened by SLAppLeyla Farazha
EXP-630 My appearance floater may be opened by SLApp EXP-633 Search floater can be opened by SLApps
2011-03-08SOCIAL-635 Hitting enter in viewer after selecting an avatar change causes ↵Leyla Farazha
another avatar change to be initiated
2011-03-16Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-01-13Automated merge up from viewer-developmentLoren Shih
2011-01-04STORM-702 FIXED Made it possible to wear partial outfitsVadim ProductEngine
Enabled the "Replace Current Outfit" option for incomplete outfits (i.e. those that don't contain full set of body parts).
2010-12-21Automated merge from mesh-developmentLoren Shih
2010-12-20SH-682 FIX, SH-594 FIX - removed mFMP wrapper, added thread checking. Moved ↵Brad Payne (Vir Linden)
onIdle functions to llcallbacklist.
2010-11-15mergeRichard Linden
2010-11-09STORM-559 FIXED crash upon quitting the viewer while an outfit is being saved.Seth ProductEngine
2010-10-29STORM-184 FIXED Disabled "Save" command for outfits without name (with "No ↵Seth ProductEngine
Outfit" in My Appearance SP).
2010-10-21EXP-271 FIX Implement slapp functionality for changing avatarscallum
2010-09-01VWR-22695 FIXED Adding attachments messaging is inefficientLoren Shih
Single attachment request are now batched up and sent all at once as a single message.
2010-08-26EXT-8727 FIXED Potential fix for a crash in ↵Vadim Savchuk
LLAppearanceMgr::updateClothingOrderingInfo. I couldn't reproduce the problem (it has happened for only two users, both running MacOSX), but from what I see in the logs, it might have been caused by (or related to) NULL COF items. I haven't found out how they appear nor what exactly causes the crash, but just for any case I added a check to make sure we don't try to update wearables ordering info for such items. Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/876/ --HG-- branch : product-engine
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-17(final?) hairy merge from viewer-release to viewer-publicTofu Linden
2010-08-13mergeBrad Payne (Vir Linden)
2010-08-13EXT-8650 Can wear multiple copies of no-copy item via object linksLoren Shih
* EXT-8661 Take out unused mRegisteredAttachments in LLAppearanceMgr Removed unused mRegisteredAttachments. Not sure what this was used for, but it's no longer used.
2010-08-13EXT-8650 Can wear multiple copies of no-copy item via object linksLoren Shih
* EXT-8688 Automatically detach same object is detected * EXT-8689 Cleanup detachAttachmentIntoInventory code When an object arrives as an attachment, if it's already attached then it's automatically detached.
2010-08-13merge from viewer-releaseTofu Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-08-12DEV-52580 WIP: disallow multiple links to the same attachment in ↵Brad Payne (Vir Linden)
updateAppearanceFromCOF()
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