summaryrefslogtreecommitdiff
path: root/indra/llcharacter
AgeCommit message (Collapse)Author
2022-05-31Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/llprimitive/llmodel.cpp # indra/llprimitive/llmodel.h # indra/newview/llappviewer.cpp # indra/newview/llappviewer.h
2022-03-01Merge branch 'master' (DRTVWR-557) into DRTVWR-546Andrey Kleshchev
# Conflicts: # autobuild.xml # doc/contributions.txt # indra/cmake/GLOD.cmake # indra/llcommon/tests/llprocess_test.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpoolavatar.cpp # indra/newview/llfloatermodelpreview.cpp # indra/newview/llmodelpreview.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp # indra/newview/viewer_manifest.py
2022-02-28Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/llaudio/llstreamingaudio_fmodstudio.cpp # indra/newview/llviewerregion.cpp
2022-01-28SL-16728 FIXED animations are not stopped after pressing the Alt + Shift + AMnikolenko Productengine
2022-01-14SL-16606: Don't spam logging with debug joint info.Ptolemy
2022-01-14SL-16606: Add note about RP3Ptolemy
2022-01-14SL-16606: Add profiler category AVATARPtolemy
2022-01-14SL-16606: Add profiler category AVATARPtolemy
2022-01-12SL-316 - Fix fencepost errors in computing keyframe start times of .bvh loader.Howard Stearns
2021-12-15DRTVWR-546 merge up to 6.5.2Dave Houlton
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-10-28SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove ↵Dave Parks
LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton
2021-10-14SL-16131 Fix for alignment warnings on Win32 builds.Dave Parks
2021-09-20SL-16006 and SL-16009 Rigged mesh rendering optimization passDave Parks
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)