9b0569840f
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/llprimitive/llmodel.cpp
# indra/llprimitive/llmodel.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
2022-05-31 01:58:09 +03:00
97a103255e
Merge branch 'master' (DRTVWR-557) into DRTVWR-546
...
# 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-03-01 13:41:42 +02:00
1e0eafd50c
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/newview/llviewerregion.cpp
2022-02-28 21:56:25 +02:00
134d8cc358
SL-16728 FIXED animations are not stopped after pressing the Alt + Shift + A
2022-01-28 11:45:49 -08:00
a255c6bc72
SL-16606: Don't spam logging with debug joint info.
2022-01-14 11:50:22 -08:00
9c7935e1a3
SL-16606: Add note about RP3
2022-01-14 11:50:22 -08:00
84b746ad8e
SL-16606: Add profiler category AVATAR
2022-01-14 11:50:22 -08:00
41894327c3
SL-16606: Add profiler category AVATAR
2022-01-14 11:50:19 -08:00
67dc2924bf
SL-316 - Fix fencepost errors in computing keyframe start times of .bvh loader.
2022-01-12 17:56:42 -08:00
cf35d27dfb
DRTVWR-546 merge up to 6.5.2
2021-12-15 14:37:18 -07:00
7c1cd47772
Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maint
...
# Conflicts:
# indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback
# indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
2021-12-15 21:16:47 +02:00
8d20480c5f
SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton
2021-10-28 18:06:21 +00:00
851767b808
SL-16131 Fix for alignment warnings on Win32 builds.
2021-10-14 17:41:38 +00:00
f79890669d
SL-16006 and SL-16009 Rigged mesh rendering optimization pass
2021-09-20 18:58:09 +00:00
0e7403df70
SL-14076 Preview should show more data about motions
2021-04-08 22:22:09 +03:00
168d177197
This set of changes reverts the merge with master (git revert c83e740) and 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-09 14:39:51 -08:00
c83e740ef9
Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519"
...
This reverts commit e61f485a0400c47d079f
2021-03-08 13:56:16 +00:00
1cdcc00319
Mostly automatic merge with canonical viewer after release
2020-10-14 13:47:26 -07:00
a350009614
SL-14107 fixed crash due to missing animation when avatar hits the ground after falling down
2020-10-13 15:01:22 +03:00
6be1f88a5e
Complete the change from lldiskcache -> llfilesystem and then addition of new lldiskcache implementation
2020-09-24 14:45:39 -07:00
d9448c6f52
The folder where the disk cache lives was originally renamed from llvfs to 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-17 09:45:06 -07:00
2e6f516411
Renamed the references to LLVFile and llvfile.* source code plus cmake 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-16 21:12:53 -07:00
3fc07dea01
First part of change to remove LLVFS from the Viewer. Consists of code 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-16 18:53:24 -07:00
a4b1c0330a
Merge branch 'master' into DRTVWR-482
...
# Conflicts:
# indra/newview/app_settings/shaders/class1/objects/previewV.glsl
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
2020-04-21 13:12:05 +03:00
6a3cb73009
SL-379 Joint overrides tab
2020-02-10 18:29:52 +02:00
179f719890
Merge branch 'master' into DRTVWR-482
2020-02-03 15:43:07 +02:00
c5859778bc
SL-379 WIP Joint overrides tab
2020-01-17 21:08:38 +02:00
f61a5c4642
Merge viewer-release 6.3.6 into viewwer-eep repo
2019-12-16 12:47:19 -07:00
71af0a2a9e
Fix shutdown crash in teardown of joint heirarchy.
...
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-06 14:41:55 -07:00
76128c4357
SL-10566 Use vector for some high-traffic, low-item count containers instead of list.
...
Provide method of storing joint indices sep from weight data for faster runtime processing.
2019-08-05 12:04:29 -07:00
87be5f7997
SL-4150 Rename htonmemcpy
2019-07-24 16:58:24 +03:00
2d3b805b94
SL-10471 - collision volume api
2019-02-06 13:44:54 +00:00
a77344516c
SL-10471 - animation validation for constraints
2019-02-05 21:38:00 +00:00
2c81ace766
SL-1290 - stop animations immediately if avatar is paused
2018-09-28 19:13:17 +01:00
a84ee929a5
merge
2018-09-27 19:54:10 +01:00
56458152ac
SL-704 - code cleanup, mostly old AXON comments.
2018-08-08 22:11:32 +01:00
e24d4c9f4d
MAINT-8923 Better allocation failure handling, createGLTexture crashes
2018-07-26 20:06:26 +03:00
228525aa27
SL-915 - tracking joint is rigged state
2018-06-04 14:43:06 +01:00
e86839fac1
SL-915 - WIP on dynamic joint box tracking
2018-06-01 15:08:59 +01:00
b42b0a9fb9
MAINT-8554 - disabled joint position clamping for now
2018-05-14 14:15:10 +01:00
bc773adf61
MAINT-8549 - refactoring of streaming cost and related calculations
2018-04-24 16:55:55 +01:00
f954abd9df
MAINT-8549, MAINT-8554 - improvements to animesh ARC, restrict joint position overrides to +/-5m
2018-04-20 13:37:07 +01:00
f7134144a6
MAINT-8239 - joint offsets
2018-04-13 14:28:19 +01:00
2b79663021
merge
2018-02-13 13:58:23 +00:00
2e6e6c4346
MAINT-8104 - make pausing of wireframe updates a little smarter - waits for a couple of frames to make sure state is current before starting to skip LLRiggedVolume::update()
2017-12-20 16:26:17 +00:00
1fd5d03847
SL-763 - disabled in slightly different way, more comments
2017-11-17 11:48:58 +00:00
b625f9cd99
SL-763 - disabling the use_quantum optimization in LLMotionController until it can be fixed.
2017-11-16 20:33:11 +00:00
299592e88e
merge
2017-10-11 14:16:39 +01:00
d62ad1ef8a
merge changes for 5.0.8-release
2017-10-11 09:13:55 -04:00
e27efe8947
SL-731 - more bug fix
2017-08-04 21:13:10 +01:00
Andrey Lihatskiy