summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatar.cpp
AgeCommit message (Collapse)Author
2021-07-20Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/llcommon/llerror.cpp # indra/llui/llnotifications.h # indra/newview/llappviewer.cpp # indra/newview/llappviewermacosx.cpp
2021-03-09Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
2021-03-09Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2021-03-08Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into ↵Brad Payne (Vir Linden)
DRTVWR-519" This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5.
2021-03-02Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
2021-03-02Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2021-02-17Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
2021-02-17Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2021-02-17Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519unknown
2021-02-03Merge with Master after Viewer releaseCallum Prentice
2021-02-01Merge remote-tracking branch 'origin/master' into DRTVWR-517Brad Payne (Vir Linden)
2021-02-01Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llappviewer.cpp
2021-02-01Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2020-12-07SL-14467 - jellydolled animesh bounding box needs to include rigged mesh ↵Brad Payne (Vir Linden)
extents.
2020-11-10SL-14303 Fix LLWearableType to not spam in logsAndrey Kleshchev
2020-11-04SL-14015 - possible fix for phantom animesh attachments on macBrad Payne (Vir Linden)
2020-11-03SL-14190 moved sAvatarDictionaryAndrey Kleshchev
2020-10-27SL-14183, SL-14142 - impostor management improvements, animesh attachments ↵Brad Payne (Vir Linden)
update on frames when their parent does
2020-10-26SL-14190 sAvatarDictionary was not usedAndrey Kleshchev
2020-10-22SL-14142 - cleanup and fixes for non-functioning impostors, status tracking ↵Brad Payne (Vir Linden)
in debug view
2020-10-20SL-14142 - impostor management cleanupBrad Payne (Vir Linden)
2020-10-19mergeBrad Payne (Vir Linden)
2020-10-16SL-14130 Jellydolls have wrong appearance when non-impostors is uncappedAndrey Kleshchev
2020-10-15Merge remote-tracking branch 'origin/master' into DRTVWR-517Brad Payne (Vir Linden)
2020-10-15SL-14130 - WIP, notes on impostor state managementBrad Payne (Vir Linden)
2020-10-14Mostly automatic merge with canonical viewer after releaseCallum Prentice
2020-10-14Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2020-10-05SL-14046 - jellydoll impostor extents should be based only on system avatarBrad Payne (Vir Linden)
2020-10-02SL-14045 - add a distinguishing flag in animation info so playing animations ↵Brad Payne (Vir Linden)
can be distinguished from others
2020-09-28Merge with tip of ReleaseCallum Prentice
2020-09-28Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llvocache.cpp
2020-09-28Merge remote-tracking branch 'origin/master' into DRTVWR-517Brad Payne (Vir Linden)
2020-09-28Merged master(DRTVWR-497) into DRTVWR-482Andrey Kleshchev
2020-09-23Merge remote-tracking branch 'origin/master' into DRTVWR-517Brad Payne (Vir Linden)
2020-09-22Merge branch 'master' v6.4.9 into DRTVWR-497Dave Houlton
2020-09-22Merge branch 'master' into DRTVWR-519Callum Prentice
2020-09-22Merged master (DRTVWR-503) into DRTVWR-482Andrey Kleshchev
2020-09-16First part of change to remove LLVFS from the Viewer. Consists of code ↵Callum Prentice
changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change.
2020-09-09SL-3278 Small adjustementAndrey Kleshchev
2020-09-08SL-13875 - update animation states right away when av goes from jellied to ↵Brad Payne (Vir Linden)
normal
2020-09-08SL-3278 Parts unique to 'self' should not affect render complexityAndrey Kleshchev
2020-09-08SL-3278 Wrap debug code into debug optionAndrey Kleshchev
2020-07-24SL-13000 - fix for animation transitions when switching to/from jellydollBrad Payne (Vir Linden)
2020-07-22SL-13611 - make sure impostor gets drawn for initially jellydolled avatarsBrad Payne (Vir Linden)
2020-07-15SL-13546 - vertical jumps when switching to or from jellydoll stateBrad Payne (Vir Linden)
2020-07-06SL-13547 - hide hair of jellied system avsBrad Payne (Vir Linden)
2020-07-02SL-13541 - conceal animesh attachments of invisible (blocked) avsBrad Payne (Vir Linden)
2020-07-02SL-13534 - make system avatar visible with jellydolled BOM avatarsBrad Payne (Vir Linden)
2020-06-24SL-13000 - de-colorize jellydollsBrad Payne (Vir Linden)
2020-05-28SL-13000 - animation state management for jellydolled avatarsBrad Payne (Vir Linden)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 12:40:56 +0000