summaryrefslogtreecommitdiff
path: root/indra/llcharacter
AgeCommit message (Collapse)Author
2021-12-15Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maintAndrey Kleshchev
# Conflicts: # indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback # indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
2021-04-08SL-14076 Preview should show more data about motionsAndrey Kleshchev
2021-03-09This set of changes reverts the merge with master (git revert c83e740) and ↵Callum Prentice
results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
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.
2020-10-14Mostly automatic merge with canonical viewer after releaseCallum Prentice
2020-10-13SL-14107 fixed crash due to missing animation when avatar hits the ground ↵Mnikolenko Productengine
after falling down
2020-09-24Complete the change from lldiskcache -> llfilesystem and then addition of ↵Callum Prentice
new lldiskcache implementation
2020-09-17The folder where the disk cache lives was originally renamed from llvfs to ↵Callum Prentice
llcache but @henri's suggestion that that doesn't reflect the other files in the same place and it should be llfilesystem is a good one so I changed it over
2020-09-16Renamed the references to LLVFile and llvfile.* source code plus cmake ↵Callum Prentice
scripts to use a different name - lldiskcache - since that more closely resembles what it is (or will be) now that the VFA is no more
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-04-21Merge branch 'master' into DRTVWR-482Andrey Lihatskiy
# Conflicts: # indra/newview/app_settings/shaders/class1/objects/previewV.glsl # indra/newview/lldynamictexture.cpp # indra/newview/llfloatermodelpreview.cpp
2020-02-10SL-379 Joint overrides tabAndrey Kleshchev
2020-02-03Merge branch 'master' into DRTVWR-482Andrey Lihatskiy
2020-01-17SL-379 WIP Joint overrides tabandreykproductengine
2019-12-16Merge viewer-release 6.3.6 into viewwer-eep repoDave Houlton
2019-08-06Fix shutdown crash in teardown of joint heirarchy.Graham Linden
Ifdef'd code for potential skinning speed up to avoid lots of int<->float conversions (expensive and static for min space investment) as updating rigged VBs shows up as a profiling bottleneck for Low rendering (where we actually use CPU skinning).
2019-08-05SL-10566 Use vector for some high-traffic, low-item count containers instead ↵Graham Linden
of list. Provide method of storing joint indices sep from weight data for faster runtime processing.
2019-07-24SL-4150 Rename htonmemcpyandreykproductengine
2019-02-06SL-10471 - collision volume apiBrad Payne (Vir Linden)
2019-02-05SL-10471 - animation validation for constraintsBrad Payne (Vir Linden)
2018-09-28SL-1290 - stop animations immediately if avatar is pausedBrad Payne (Vir Linden)
2018-09-27mergeBrad Payne (Vir Linden)
2018-08-08SL-704 - code cleanup, mostly old AXON comments.Brad Payne (Vir Linden)
2018-07-26MAINT-8923 Better allocation failure handling, createGLTexture crashesandreykproductengine
2018-06-04SL-915 - tracking joint is rigged stateBrad Payne (Vir Linden)
2018-06-01SL-915 - WIP on dynamic joint box trackingBrad Payne (Vir Linden)
2018-05-14MAINT-8554 - disabled joint position clamping for nowBrad Payne (Vir Linden)
2018-04-24MAINT-8549 - refactoring of streaming cost and related calculationsBrad Payne (Vir Linden)
2018-04-20MAINT-8549, MAINT-8554 - improvements to animesh ARC, restrict joint ↵Brad Payne (Vir Linden)
position overrides to +/-5m
2018-04-13MAINT-8239 - joint offsetsBrad Payne (Vir Linden)
2018-02-13mergeBrad Payne (Vir Linden)
2017-12-20MAINT-8104 - make pausing of wireframe updates a little smarter - waits for ↵Brad Payne (Vir Linden)
a couple of frames to make sure state is current before starting to skip LLRiggedVolume::update()
2017-11-17SL-763 - disabled in slightly different way, more commentsBrad Payne (Vir Linden)
2017-11-16SL-763 - disabling the use_quantum optimization in LLMotionController until ↵Brad Payne (Vir Linden)
it can be fixed.
2017-10-11mergeBrad Payne (Vir Linden)
2017-10-11merge changes for 5.0.8-releaseOz Linden
2017-08-04SL-731 - more bug fixBrad Payne (Vir Linden)
2017-08-04SL-731 - bug fixBrad Payne (Vir Linden)
2017-07-28SL-763 - added some additional logging related to animation playback speedBrad Payne (Vir Linden)
2017-06-16SL-697 - global scale function for LLControlAvatar, to support arbitrary ↵Brad Payne (Vir Linden)
scaling of animated objects. Not currently used.
2017-06-06MAINT-7466 - added more verbose logging of animation issues found by the ↵Brad Payne (Vir Linden)
viewer, including invalid joints. Flag the asset id now.
2017-07-04MAINT-7329 Viewer was spamming log with motion limit messagesandreykproductengine
2016-11-16mergeBrad Payne (Vir Linden)
2016-11-04SL-524 - resetSkeleton() now includes collision volume joint positions. Also ↵Brad Payne (Vir Linden)
removed no-longer-needed LLJoint::mId field
2016-10-27SL-503 - more info in archetype dump filesBrad Payne (Vir Linden)
2016-09-22MAINT-6694 Gesture floater crashandreykproductengine
2016-09-05Backed out changeset: d3ffc46e9e92andreykproductengine
2016-09-02SL-395 - partial support for joint scale locking via flag in skin infoBrad Payne (Vir Linden)
2016-09-02mergeBrad Payne (Vir Linden)
2016-09-01MAINT-6221 If two animations have the same priority, it's arbitrary which ↵andreykproductengine
one will take precedence