summaryrefslogtreecommitdiff
path: root/indra/newview/llappearancemgr.cpp
AgeCommit message (Collapse)Author
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
2010-05-24EXT-7463 FIXED Create instrumentation for tracking COF actions on loginLoren Shih
Added a bunch of llinfos to track various COF link item actions.
2010-05-19AVP-44 WIP Back-end support for multiwearablesNyx Linden
Changed a lot of areas of code that were not dealing with multiwearables properly. Little functionality changed, as the support mechanisms that were out of date were subtle, but getting closer to no further areas of code that don't properly support multi-wearables. Code reviewed by Vir.
2010-05-18adding verbose logging around your own avatar rez time. Documents load timesNyx (Neal Orman)
for each component texture at each discard level, as well as baked texture upload times, and reports the timing of each texture to the console when your avatar sends out its appearance data to the server. Reviewed by Seraph, will be removed before release. -Nyx
2010-05-17EXT-6964 FIXED Added back the secondlife:///app/appearance SLapp handler.Lynx Linden
This was removed inadvertantly in change 1fc92fc19c98.
2010-05-13EXT-7305 : FIXED : Changed LLWearableDictionary to LLWearableTypeLoren Shih
Change enum naming to use WT_INVALID=255 instead of WT_NONE=255. Added WT_NONE as -1.
2010-05-11EXT-7305 : FIXED : Changed LLWearableDictionary to LLWearableTypeLoren Shih
Refactored LLWearableDictionary to look more like LLAssetType/LLFolderType/etc. in terms of code design. This required a lot of superficial changes across many files. Overall functionality has not changed.
2010-04-28partial implementation of EXT-6723 Create specialized view of inventory for ↵Igor Borovkov
"clothing" accordion tab of outfit editor - added grouping clothing items by wearable type (shirt, jeans etc.) - added sorting clothing items by wearing order in groups - added separators between items of the same wearable type (lists: clothing, body parts) - added list specific button bars - partially added dummy items for missing wearable types in the COF (clothing list) Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/322 --HG-- branch : product-engine
2010-04-27additional fix for EXT-6721 (Enable UI for user modification of wearable order)Igor Borovkov
corrected dirty state management - taking into account changes in ordering between wearables of COF and Base Outfit Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/280/ --HG-- branch : product-engine
2010-04-23fixed linux buildIgor Borovkov
no review, no jira issue --HG-- branch : product-engine
2010-04-23completed EXT-6721 (Enable UI for user modification of wearable order)Igor Borovkov
- added functionality to change order of wearables - added ad-hoc up and down buttons on a button bar ("up" means closer to the body) - https://jira.secondlife.com/secure/attachment/38464/screenshot-1.jpg - added displaying wearables as sorted by order on the Edit Outfit panel (top list) Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/280/ --HG-- branch : product-engine
2010-04-21completed EXT-6719 Utilize the "description" field of outfit wearable links ↵Igor Borovkov
to store order information - COF items get checked for correct ordering when COF is loaded (LLAppearanceMgr::updateAppearanceFromCOF..., LLAppearanceMgr::updateClothingOrderingInfo() ), and also when COF is saved to a new outfit, base outfit. - wearables are arranged in LLAgentWearables in a proper order * updateClothingOrderingInfo() [struggling with naming] does integrity checking and updates "invalid" items (items with wrong, gapped descriptions) * moved LLAgentWearables::makeNewOutfitLinks(...) and LLShowCreatedOutfit to a more natural place (llappearancemgr.cpp), because they use LLAppearanceMgr's methods a lot * changed link_inventory_item(...), added the "new_description" parameter Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/268/ --HG-- branch : product-engine
2010-04-14merge from PE's viewer-trunkTofu Linden
2010-04-13automated mergeLoren Shih
2010-04-13done EXT-6675 Fix TRASH btn on Edit Outfit panel to remove an item from ↵Igor Borovkov
avatar (from COF) Trash button removes from avatar a selected item only of "clothing" and "object" types Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/209/ --HG-- branch : product-engine
2010-04-09done EXT-6688 Implement Revert button funtionality (Edit Outfit panel)Igor Borovkov
On revert the base outfit is worn Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/205/ --HG-- branch : product-engine
2010-04-09done EXT-6716 Implement Add button functionality for adding a wearable to ↵Igor Borovkov
Current Outfit (Edit Outfit panel) Added temporary PLUS button on the button bar under the top list of Edit Outfit panel Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/203/ --HG-- branch : product-engine
2010-04-09done EXT-6687 Implement Save button functionality (Edit Outfit panel)Igor Borovkov
Implemented "Save", "Save as new" functionality. If the base outfit doesn't exist "Save as new" functionality is employed Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/179 --HG-- branch : product-engine
2010-04-06EXT-6727 : Allow LLInventoryObservers to target a single item (instead of a ↵Loren Shih
vector of items) Added new constructors to LLInventoryFetch types to allow passing in a single item.
2010-04-01Cleanup and consolidationBrad Payne (Vir Linden)
2010-04-01Cleanup and consolidationBrad Payne (Vir Linden)
2010-04-01Cleanup and consolidationBrad Payne (Vir Linden)
2010-03-30Automated merge with ssh://hg.lindenlab.com/q/viewer-trunkNyx (Neal Orman)
2010-03-30EXT-3415 : INFRASTRUCTURE : Move LLInventoryCollectFunctors to separate classLoren Shih
Moved all the LLInventoryModelCOllectFunctors from LLInventoryModel to LLInventoryFunctions
2010-03-30Automated merge with ssh://hg.lindenlab.com/q/viewer-trunkNyx (Neal Orman)
2010-03-30EXT-6633 enable basic multiwearables demoNyx (Neal Orman)
Fixed several areas of code that were not multi-wearables enabled. Specifically allowed for the wearing of created outfits that had links to multiple items of the same type. Such outfits can be created by dragging multiple items of the same type into an unworn outfit folder. When you wear the outfit, all items (up to 5 per type) should be worn. Does not affect right-click options or other buttons. Code reviewed by Vir.