summaryrefslogtreecommitdiff
path: root/indra/newview/llagentwearables.cpp
AgeCommit message (Collapse)Author
2009-11-12Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Eric M. Tulla (BigPapi)
2009-11-12Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Brad Payne (Vir Linden)
2009-11-11mergeLoren Shih
2009-11-11Fix for EXT-2244 - Auto fill the My Outfits folder from library/clothing if ↵Eric M. Tulla (BigPapi)
empty -Reviewed by Seraph
2009-11-11Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Brad Payne (Vir Linden)
2009-11-11Believe this fixes the remaining issues with missing attachment links on ↵Brad Payne (Vir Linden)
first use of 2.0 - EXT-1593 and EXT-1591.
2009-11-11EXT-2173 use of visual param animation inconsistent at bestNyx (Neal Orman)
removed ambiguous parameter "set_by_user" from many places in codebase, renaming it to be upload_bake, which is a more accurate descriptor. This allowed me to see several inconsistencies in how this variable was being set - these errors were also fixed. User-visible result should be that baked textures are not reuploaded on changing avatar sex until the save button is pressed. primary win here is code clarity. Code reviewed by Bigpapi.
2009-11-10Minor comment cleanup for llagentwearables.cpp.Loren Shih
2009-11-05Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Brad Payne (Vir Linden)
2009-11-04Small cleanup in LLAgentWearables.cppBrad Payne (Vir Linden)
2009-11-04For EXT-1985: Clothing previously taken off is re-worn when creating a new ↵Brad Payne (Vir Linden)
clothing item in appearance mode. General problem with failing to update the COF when clothing items were removed. Added hook in removeWearableFinal, which should guarantee that we're always removing clothing links when we need to.
2009-11-04Redo Bao's broken mergeBryan O'Sullivan
2009-11-03Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0Brad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-11-03For EXT-1591: Current Outfit Folder contains duplicate attachment items ↵Brad Payne (Vir Linden)
after relog. --HG-- branch : avatar-pipeline
2009-11-02Merge conflict resolution for previous commit.Loren Shih
--HG-- branch : avatar-pipeline
2009-11-02EXT-1866 : Inventory Side PanelLoren Shih
svn merge -r137106:137808 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/inventory-panel Porting over changes from svn Inventory Panel work.
2009-10-29Fix signed/unsigned mismatch breaking the build.James Cook
2009-10-29previous checkin had a signed/unsigned mismatch. Using a cast to fix it.Nyx (Neal Orman)
2009-10-29EXT-1945 visual parameter animations brokennyx@NyxTop
First round of fixes for trying to fix the visual param animations Code reviewed by Seraph
2009-10-23EXT-1809 Wearing an item doesn't update avatarNeal Orman
Two part fix: prevented the copying of wearable parameters to the avatar to trigger a rebake. Then: Called wearableUpdated every time a wearable was added/removed/replaced and ensured it properly invalidated the composite Confirmed working fix on developer machine. Code reviewed by Seraph.
2009-10-23svn merge -r137024:137071 ↵Loren Shih
svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/avatar-pipeline-14-seraph into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 Bugs: EXT-1785 EXT-1818 EXT-1820 EXT-1845
2009-10-22EXT-1822 changing textures in appearance not immediateNeal Orman
Texture changes in appearance editor were not taking effect immediately. Changed texture setting code to refresh local bake of textures. Code reviewed by Vir
2009-10-22EXT-1784 Server getting spammed whenever you put on a wearableNeal Orman
Made an adjustment to ignore remove requests on items that don't exist, to avoid the extra messages to the server. Also made a couple of adjustments to ensure removal of alpha masks and tattoos along with other wearable types. Added these code points to the wiki page detailing what modifications need to be made when adding a new wearable type: https://wiki.lindenlab.com/wiki/User:Vir#Adding_new_wearables Code reviewed by Seraph.
2009-10-21Code audit for r136515 ("merging in new wearable infrastructure...")Loren Shih
No expected functionality change; this mostly contains cosmetic cleanup. Reviewed by: Nyx
2009-10-19Remove "add" inventory operation and rename MAX_WEARABLES_PER_TYPENeal Orman
This patch removes the invalid "add" operation shown on wearables in inventory It also renames MAX_WEARABLES_PER_TYPE, resets the value to 1 (non-multi-wearables), and adds a weak check to enforce one wearable per type. Code reviewed by Vir
2009-10-16svn merge -r134817:136516 ↵Loren Shih
svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/avatar-pipeline-multiattachments-3 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 For DEV-32867 : Avatar Pipeline Project - Multi-Attachments This is a viewer-side-only, infrastructure-only merge for multi-attachments. This should not lead to any new functionality; it simply provides backwards compatibility for when multi-attachments are enabled in viewer2.1, so that viewer2.0 users can see viewer2.1 avatars correctly. Reviewed by: Vir.
2009-10-16merging in new wearable infrastructure to get a step closer to eventually ↵Neal Orman
supporting multiple wearables per type. Merge tested and compiles/working on linux and windows - no obvious regressions on appearance or appearance editor. Merge generated no conflicts due to being tested in fresh re-branch in avatar-pipeline/multiple-textures-12. Merge perfomed with following command: svn merge -r 136489:136510 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/multiple-textures-12 . Progress can be tracked in DEV-32551. -Nyx
2009-10-12Merging avatar-pipeline/currently-worn-folder-10 down to viewer-2.Bradley Payne
svn merge -r 134766:135946 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-10 .
2009-09-29Syncing latest appearance work from avatar pipeline into viewer2.0.Eric Tulla
Result of: (NO CONFLICTS) svn merge -r 134301:134742 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-9 .
2009-09-24Merging down avatar-pipeline/currently-worn-folder-8. Includes fixes for ↵Bradley Payne
EXT-1121: Attaching / detaching objects doesn't affect the Current Outfit folder, and EXT-1090: Attachments detach on login, as well as work in progress for ensemble support and look details.
2009-09-11For DEV-39666 : Ensure AgentWearables saves actual items, not links, to databaseLoren Shih
For backwards compatibility, this change ensures that links aren't saved to user_wearable. Reviewed by: Vir.
2009-09-10For DEV-34223: Avatar Pipeline Project - M6 (Current Outfit Folder, ↵Bradley Payne
Appearance Side Panel) - brought merge branch changes from avatar-pipeline/viewer-2.0.0-3_cwf-7_merge into viewer-2.0.0-3. svn merge -r132878:132947 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/viewer-2.0.0-3_cwf-7_merge
2009-08-18For DEV-34223: Avatar Pipeline Project - M6 (Current Outfit Folder). Make ↵Bradley Payne
sure that only wearables from the COF are handled as wearables during initial COF load. Added error checking for null asset IDs. This fixes a crash on login observed after loading from COF was enabled.
2009-08-18svn merge -r130469:130817 ↵Loren Shih
svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-6 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 This merges in all appearance side panel bug fixes.
2009-08-12For DEV-37866 : Crash when creating a new look b/c of non-existent attachmentsLoren Shih
Simple fix -- added NULL check to logic that processes attachments.
2009-08-12svn merge -r129617:130277 ↵Loren Shih
svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-5 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 For DEV-34223 : AVP Current Outfit Folder For DEV-37485 : AVP Appearance Side Panel For DEV-35335 : AVP Automatic Folder Classification This merges the Appearance Side Panel / Ensemble Typing / Current Outfit Folder work for the AVP team.
2009-07-14QAR-1602 Checkpoint for Avatar Pipeline Multiple textures branchNeal Orman
Merging changes for first checkpoint of multiple textures branch as part of the avatar pipeline project (AVP). Functionality should be same as before, but sets up the structure that later changes build upon. Changes passed QA, merge conflicts were minimal and easily resolved. Contact Nyx with any problems with this code. -Nyx
2009-07-07Merge skinning-14 to viewer-2, including refactoring many floaters to ↵James Cook
register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files: lldraghandle.h, lluictrl.h, llchiclet.cpp, llfolderview.h/cpp, lliinventorybridge.cpp, llpanelpicks.cpp, llviewermenu.cpp, floater_mute.xml, floater_preferences.xml, notifications.xml, panel_preferences_audio.xml, panel_preferences_graphics1.xml, panel_region_general.xml svn merge -r124961:126284 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-14
2009-06-24merge -r125267:125272 ↵Loren Shih
svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/inventory-links__merge__viewer2.0.0-3-r125202 to svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 18:09:30 +0000