summaryrefslogtreecommitdiff
path: root/indra/newview/llappearancemgr.cpp
AgeCommit message (Collapse)Author
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.
2010-06-15EXT-7468 FIXED Remove all 2.1 COF debugging codeLoren Shih
#ifdef'd a bunch of llinfos spam to not show up in release mode. Removed some other legacy comments.
2010-06-15mergeBrad Payne (Vir Linden)
2010-06-15mergeBrad Payne (Vir Linden)
2010-06-15EXT-7794 FIXED Implemented a common-used notification about wearing outfit ↵Mike Antipov
to display loading indicator. Details: * Added signal "Wearable Loading Started" in AgentWearables (in parallel with "Wearables Loaded") * Now it is raised from the LLAppearanceMgr::wearInventoryCategory. Reviewed by Vadim Savchuk and Neal Orman at https://codereview.productengine.com/secondlife/r/583/ --HG-- branch : product-engine
2010-06-14EXT-6571 WIP - fixes for handling of late arriving assetsBrad Payne (Vir Linden)
2010-06-14EXT-6571 WIP - basic handling of late arriving assetsBrad Payne (Vir Linden)
2010-06-14EXT-7783 FIXED Provided updating outfit label in My outfits and Edit outfit ↵Alexei Arabadji
panels. 1 Corrected LLAppearanceMgr::getBaseOutfitLink() method to avoid returning link in case base outfit moved to trash. 2 Hooked up LLSidepanelAppearance::refreshCurrentOutfitName() method on BOFReplaced signal. reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/571/ --HG-- branch : product-engine
2010-06-14EXT-7727 FIX reset sidetray tab to home_tab when login is complete.Yuri Chebotarev
Aslo add parameter to callback to prevent showing appearance panel when creating initial outfit - _sometimes_ this callback was called _after_ login was finished. rewieved by Mike Antipov at https://codereview.productengine.com/secondlife/r/574/ --HG-- branch : product-engine
2010-06-11EXT-6571 WIP - partial handling of late arriving assetsBrad Payne (Vir Linden)
2010-06-11mergeBrad Payne (Vir Linden)
2010-06-11EXT-6571 WIP - adding ability to handle late-arriving assetsBrad Payne (Vir Linden)
2010-06-11EXT-7716 FIXED Allowed removing an outfit containing links to worn wearables.Vadim Savchuk
Removed a redundant check disallowing removal of an outfit containing links to worn items. So now we use the same condition as in the inventory panel. Note that if an outfit that you're trying to remove contains originals of currently worn items, we still disallow removal. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/559/ --HG-- branch : product-engine
2010-06-08EXT-7210 Baked textures should only be updated when outfit changes are saved ↵Leyla Farazha
or outfit editor is exited. reviewed and contributed to by Nyx
2010-06-08EXT-7644 FIXED Implemented functionality for locking outfit modification ↵Alexei Arabadji
controls and used it for 'save outfit' action. 1 Added functionality for locking outfit in LLAppearanceMgr. Outfit should be locked when outfit related operation is started(now it is used for updateBaseOutfit) and unlocked when operation completed or timeout is exceeded. 2 Added outfit saved and outfit lock changed signals to LLOutfitObserver. 3 Updated LLPanelOutfitsInventory and LLPanelOutfitEdit with functionality of controlling 'save outfit' controls state('save outfit' controls should be enabled only if outfit isn't locked and outfit is dirty). 4 Renamed action label of method LLPanelOutfitsInventory::isActionEnabled "make_outfit" to "save_outfit". --HG-- branch : product-engine
2010-06-04AVP-44 VWR-19699 FIX Multi-wearables and wearable replacement logicNyx (Neal Orman)
Cleaned up a few things upon code review. Code reviewed by vir for this checkin as well as following previous commits: a801af3728ee af42810b946c
2010-06-03AVP-44 WIP Multi-wearables architectureNyx (Neal Orman)
One step closer to full support of multi-wearables architecture code will be reviewed before pushing.
2010-06-03VWR-19699 WIP Correct operations for wear and replace on wearablesNyx (Neal Orman)
Resident-submitted patch, cleaned up so it matches style and compiles/builds well. Appears to work for stated goals but will need some more UI work to ensure consistency. WIP checkin, will be code reviewed before pushing.
2010-06-02Partial fix for EXT-6255 (Fix ruthing/replacement wearables logic).Monroe Linden
This change should make the logic for missing wearables match what's in the doc linked from the jira. It doesn't address the case of missing attachments, which will be more complicated. Reviewed by Nyx and vir.
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-02EXT-6726 WIP Added more menus to the Appearance SP.Vadim Savchuk
Done: - Implemented creating new wearables via My Outfits gear menu. - Implemented renaming/removing/editing an outfit via My Outfits context menu. - Implemented "Attach to..." / "Attach to HUD..." context submenus. - Now disabling (instead of hiding) irrelevant wearable context menu items. - Added "Take Off / Detach" context menu item that's shown for clothes and attachments. Useful if you selected a bunch of items and want to take them all off. - Fixed taking off an outfit (not all wearables were taken off because of a wrong inventory collector). - Fixed crash when editing a skirt (reference to a missing string). - In LLWearableItemsList::ContextMenu::updateItemsVisibility renamed variables and introduced MASK_UNKNOWN per Nyx's request. Known issues: - "Attach to..." context menus may be displayed partially off-screen (there is the same bug in the inventory panel). - The way we invoke wearable editing panel after the wearable gets created is currently a hack. TODO: - Wear / take off / rename / delete an outfit via My Outfits gear menu (currently not implemented because of missing selection support in My Outfits). - Add "Create new..." to body part / clothing context menu in Edit Outfit. - Add "Create new..." submenus to the Edit Outfit gear menu. Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/466/ --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-28AVP-44 WIP architectural cleanup for multi-wearablesNyx (Neal Orman)
Implemented some resident-suggested tweaks to better support multiwearables code reviewed by Seraph
2010-05-28EXT-7341 FIXED updating My Outfits with wearables ordering information on ↵Igor Borovkov
the very first login added saving ordering information for wearables of already populated My Outfits category on the very first login Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/455/ --HG-- branch : product-engine
2010-05-27EXT-7209 EXT-7366 EXT-7213 FIX EXT-7392 WIPNyx (Neal Orman)
Final fixes for: EXT-7209 camera to enter appearance edit mode EXT-7366 change camera to face front of avatar in previews EXT-7213 kill old appearance editor Partial fix for: EXT-7392 alpha mask checkboxes are not hooked up All changes code reviewed by vir. Following commits (plus this one) reviewed with this checkin: 425d4e960450 15d04b6464a7 e92ae606de12 adc94512ea9b 24577dbbf7a4 6f28b241eae2 (sorry dessie! :) )
2010-05-26 EXT-7213 WIP kill old appearance editor and traces of codeNyx (Neal Orman)
Removed last remaining references to gFloaterCustomize. Next step: kill the files themselves. Will be reviewed when complete, before pushing
2010-05-26Merge from default branch, resolving conflict in ↵Mike Antipov
indra/newview/llinventorybridge.cpp LLObjectBridge::openItem() was concurrency modified. Applied behavior that was changed in c3220f7f7699 according to VWR-13743 FIXED Change Request: Change double click action for inventory wearables DEV-33391 FIXED Change Request: Change double click action for inventory wearables --HG-- branch : product-engine
2010-05-25EXT-7480 Add debuga bility to set texture discard levelsLoren Shih
Added TextureDiscardLevel override for specifying texture discard levels. Aesthetic change to add debug- flag to all avatar debug reporting metrics.
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
2010-05-24automated mergeLoren Shih
2010-05-24EXT-7463 FIXED Create instrumentation for tracking COF actions on loginLoren Shih
Added more llinfos for tracking COF and InventoryModel changes.
2010-05-24EXT-7436 FIX pt 2 - added extra check for wearable to prevent log spamNyx (Neal Orman)
Reviewed by Seraph
2010-05-24Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicNyx (Neal Orman)
2010-05-24EXT-7436 FIX every other login ruthing.Nyx (Neal Orman)
I think this is related - every time you wear one body part or a single piece of clothing, it would remove all body parts, causing you to regenerate defaults which makes you look like ruth. Simple error in logic, body parts should only be replaced if they are being removed. Code reviewed by Seraph
2010-05-24automated mergeLoren Shih