ef7254a68a
SL-17206 Unable to move an avatar after a strong fall on the ground
2022-05-25 16:15:14 +03:00
b96f92f884
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
2022-05-19 20:31:00 +02:00
307db06310
SL-10163 - allow joint aliases in animation uploads. Names are canonicalized before sending to simulator.
...
# Conflicts:
# indra/newview/llviewerassetupload.cpp
# indra/newview/llvoavatar.cpp
# scripts/content_tools/anim_tool.py
2022-05-18 23:30:02 +03:00
f7edcab9c3
SL-288, SL-10163 - allow joint aliases, but otherwise reject upload of animations containing invalid joint names
...
# Conflicts:
# indra/newview/llviewerassetupload.cpp
# indra/newview/llvoavatar.cpp
2022-05-18 23:25:51 +03:00
711799a7d5
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
2022-05-05 11:28:38 +02:00
283c2a20cc
Remove setting of HEADER_FILE_ONLY on .h* files, cmake automatically
...
sets the property on those.
2022-05-01 00:38:40 +02:00
ddaa0d84cc
SL-17206 FIXED Unable to move an avatar after fall on the ground
2022-04-29 19:06:22 +03:00
e0cf0cdfd4
Switch to target_include_directories
...
All 3Ps include dirs are treated as SYSTEM, this will stop compilers
stop emitting warnings from those files and greatly helps having high
warning levels and not being swamped by warnings that come from
external libraries.
2022-04-17 18:04:57 +02:00
786b291d9c
Move CMake files to modernized cmake syntax, step 1.
...
Change projects to cmake targetsto get rid of havig to hardcore
include directories and link libraries in consumer projects.
2022-04-06 16:32:52 +02: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
dbd7ecc9a4
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
2022-02-02 12:56:43 +01:00
134d8cc358
SL-16728 FIXED animations are not stopped after pressing the Alt + Shift + A
2022-01-28 11:45:49 -08:00
6638d1d367
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
2022-01-26 12:31:20 +01:00
0a0e2fe93e
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-01-15 02:39:07 +01: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
63cc972499
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llappearance/lldriverparam.h
# indra/llcommon/llmemory.h
# indra/llcommon/llprofiler.h
# indra/llrender/llvertexbuffer.cpp
# indra/llwindow/llwindow.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawable.cpp
# indra/newview/lldrawable.h
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpooltree.cpp
# indra/newview/lldrawpoolwater.cpp
# indra/newview/llface.cpp
# indra/newview/llinventoryfilter.cpp
# indra/newview/llselectmgr.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llvieweroctree.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llvowlsky.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/floater_stats.xml
2021-11-12 17:31:39 +01:00
7427b46ea5
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# .gitignore
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llcommon/llcommon.cpp
# indra/llcommon/llerror.cpp
# indra/llcommon/llprofiler.h
# indra/llcommon/llthread.cpp
# indra/llimage/llimageworker.cpp
# indra/llprimitive/llmodel.h
# indra/llrender/llfontgl.cpp
# indra/llrender/llfontgl.h
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolavatar.h
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llimview.cpp
# indra/newview/llmeshrepository.h
# indra/newview/llmodelpreview.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llskinningutil.cpp
# indra/newview/llskinningutil.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llteleporthistory.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoicevivox.cpp
# indra/newview/llvosky.cpp
# indra/newview/llvovolume.cpp
2021-11-12 15:21:52 +01: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
2023fb6742
Grab advanced animation preview from LL's DRTVWR-527 branch
2021-04-12 13:03:50 +02: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
6b6b116fd4
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
2021-03-03 00:20:02 +01:00
a9787eb9e5
Run Prio 0 default bento pose in the background to fix splayed hands, open mouths, etc.
2021-02-27 23:51:39 +01:00
dfef45cd21
If already logging this, make it at least useful
2021-02-24 09:51:08 +01:00
e9523213ef
Squelch even more log spam we can't do anything about
2021-02-24 09:49:20 +01:00
ec97be1f66
Don't try to create motions with null UUID
2021-02-19 09:50:16 +01: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
abee63cddc
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep
2020-04-23 18:31:20 +02: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
0e5d00af97
Merge DRTVWR-482
2020-02-24 21:05:15 +01: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
ee65b14ec8
Merge DRTVWR-482
2020-01-29 17:22:18 +01: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
da365b227e
Merge Firestorm LGPL
2019-12-13 18:15:19 +01:00
61c56570ab
Merge viewer-eep
2019-08-13 19:05:23 +02: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
529569cdd9
Merge viewer-neko
2019-08-04 12:09:33 +02:00
87be5f7997
SL-4150 Rename htonmemcpy
2019-07-24 16:58:24 +03:00
1f5d3f9871
Add memleak avoidance for the new exit paths
2019-02-06 23:09:40 +00:00
2d3b805b94
SL-10471 - collision volume api
2019-02-06 13:44:54 +00:00
b27ca1e68e
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
84cca265e5
SL-10471 - animation validation for constraints
2019-02-05 21:38:00 +00:00
52a176844c
Merge axon
2018-10-19 12:53:49 +02: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
23fd31faf6
Merge Firestorm LGPL
2018-09-27 11:59:30 +02:00
258ca74893
Merge axon
2018-08-22 12:51:42 +02:00
56458152ac
SL-704 - code cleanup, mostly old AXON comments.
2018-08-08 22:11:32 +01:00
cb20bc0425
Merge viewer-neko
2018-08-01 01:20:01 +02: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
10bf9c2486
Merge axon
2018-05-18 13:56:50 +02:00
b42b0a9fb9
MAINT-8554 - disabled joint position clamping for now
2018-05-14 14:15:10 +01:00
191dd04c73
Merge axon
2018-05-01 12:24:28 +02: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
053b4610ee
MAINT-8239 - joint offsets
2018-04-13 14:28:19 +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
76c179eeac
Merge Firestorm LGPL
2018-02-12 23:20:50 +01:00
0669906f4b
Merge axon
2018-01-04 15:53:22 +01: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
390e15460f
Merge axon
2017-11-29 23:27:11 +01: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
13ea9a242a
Merge Firestorm LGPL
2017-10-11 20:30:12 +02: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
2d6314182b
Merge Firestorm LGPL
2017-10-11 19:53:58 +02:00
01d8e7e347
Merge axon
2017-09-20 01:09:14 +02:00
1fbba39ba6
Merge Firestorm LGPL
2017-08-23 14:58:10 +02:00
a2d1b201aa
Merge Firestorm LGPL
2017-08-23 09:35:01 +02:00
9c75a8105c
Experimental fix for animation speed of impostored avatars, based on a fix of Henri Beauchamp
2017-08-20 18:06:09 +02:00
e27efe8947
SL-731 - more bug fix
2017-08-04 21:13:10 +01:00
f196d8b18d
SL-731 - bug fix
2017-08-04 21:11:11 +01:00
1b9e6225c8
SL-763 - added some additional logging related to animation playback speed
2017-07-28 13:39:54 +01:00
e07d6bc4f1
Merge viewer-neko
2017-07-18 21:37:09 +02:00
c8fc414ebe
MAINT-7329 Viewer was spamming log with motion limit messages
2017-07-04 16:25:41 +03:00
ec3767aece
Merge viewer-vivox
2017-06-19 21:48:29 +02:00
b2a0657818
SL-697 - global scale function for LLControlAvatar, to support arbitrary scaling of animated objects. Not currently used.
2017-06-16 16:03:06 +01:00
e647ea2ef4
MAINT-7466 - added more verbose logging of animation issues found by the viewer, including invalid joints. Flag the asset id now.
2017-06-06 19:09:08 +01:00
5a58635b64
Merge Firestorm LGPL
2016-11-16 16:11:56 +01:00
d31596db6a
merge
2016-11-16 08:39:41 -05:00
18dfdc2ae0
Merge bento-box
2016-11-11 16:00:37 +01:00
204e474225
SL-524 - resetSkeleton() now includes collision volume joint positions. Also removed no-longer-needed LLJoint::mId field
2016-11-04 14:24:03 -04:00
7447da6943
SL-503 - more info in archetype dump files
2016-10-27 09:39:39 -04:00
92f6d8d521
Merge viewer-bear
2016-10-01 17:03:57 +02:00
ef3b8ad594
Merge bento-box
2016-09-28 14:45:26 +02:00
5b61515ca3
MAINT-6694 Gesture floater crash
2016-09-22 12:34:52 +03:00
44ab8b8f4b
Merge with firestorm-lgpl.
2016-09-17 19:35:49 +02:00
24308dc929
The sheer amount of calls into LLVOAvatar::getJoint get very costly in complex scenes. This is due to a string being used as index. Change the index to U32 for faster access.
2016-09-16 21:46:39 +02:00
ecd11724ca
Backed out changeset: d3ffc46e9e92
2016-09-05 15:43:31 +03:00
34ced1aa2c
SL-395 - partial support for joint scale locking via flag in skin info
2016-09-02 16:44:57 -04:00
a2875ba53e
merge
2016-09-02 14:34:06 -04:00
9acf7f5733
MAINT-6221 If two animations have the same priority, it's arbitrary which one will take precedence
2016-09-01 19:11:44 +03:00
ffb27ed5ae
Merge bento-box
2016-08-15 16:55:40 +02:00
85a13b53f5
MAINT-6631 - reluctantly, added support for animation of collision volumes, to avoid breaking existing content.
2016-08-12 14:20:44 -04:00
4acba68785
Merge bento-box
2016-08-11 00:16:36 +02:00
2929922ef2
SL-242 - more tweaks around alt eyes and wings. Alt eyes are now parented to face root, and alt eyes animate along with the original eyes inside the LLHeadRotMotion code.
2016-07-11 18:00:59 -04:00
575c28239d
Merge bento-box
2016-07-06 09:24:11 +02:00
5ebf9b3cae
SL-426 - strings.xml fix for pec attachments, SL-402 - diagnostics for investigation
2016-06-29 09:41:06 -04:00
b649847fe9
SL-124 - comment cleanup, fixed a crash if skinned mesh has no valid joint names defined
2016-06-24 16:43:23 -04:00
88b928e1dd
Merge bento-box
2016-06-16 00:53:56 +02:00
d2302886bc
MAINT-6380, SL-399 - vertical flicker related to joint offsets for mPelvis. Having a joint offset for mPelvis is still a bad idea, but it won't cause as much flickering now.
2016-06-15 15:24:54 -04:00
93bafda56b
MAINT-6366 - diagnostics related to animation asset downloads
2016-06-13 09:15:42 -04:00
3a53109152
SL-395 - support scale overrides (currently no way to get these into a dae, so the actual scale values are fabricated at run-time based on the joint name)
2016-06-07 10:39:32 -04:00
919521d121
Merge Firestorm LGPL tip
2016-05-21 19:02:00 +02:00
f47ceb47bb
merged jelly-doll viewer-release into bento
2016-05-21 08:15:28 -04:00
62b508ed7e
Merge bento-box
2016-05-09 13:15:50 +02:00
ec471497f5
SL-375, SL-378 - rudimentary logging info to list joint offsets during mesh import. dae_tool.py work to enable joint offset tweaking.
2016-04-29 11:25:17 -04:00
5404f6382e
Merge bento-box
2016-04-23 12:01:35 +02:00
70156605e2
SL-374 - don't allow sliders to modify joint positions if there's already a mesh-imposed override in place.
2016-04-22 14:51:57 -04:00
223f090709
SL-371 - more tracking on partial joint overrides
2016-04-18 19:31:29 -04:00
472215b46c
Merge bento-box
2016-04-14 14:29:20 +02:00
e44bfcb5f5
SL-344, SL-276 - chin bone, slider changes.
2016-04-08 08:50:57 -04:00
8144c54661
Merge bento-box
2016-03-31 18:46:06 +02:00
11f3e485e9
SL-276 - two more bones, corresponding to foot bones for the hind limbs
2016-03-25 15:20:41 -04:00
cbbe82b8dc
SL-276, SL-344 - Skeleton and slider updates including new face joints to enable nose, eye slider controls. Increased max joint count.
2016-03-22 16:18:46 -04:00
62030e9605
Merge bento-box
2016-03-18 11:19:51 +01:00
071a30cca4
merge
2016-03-10 15:43:30 -05:00
934a168fb5
SL-315 - joint scale debug tracing
2016-03-10 15:43:05 -05:00
28c6426afb
Fix for SL-318 issue with 3-channel animations.
2016-03-10 10:07:16 -08:00
05bd94268d
SL-315 - wip on joint reset
2016-03-10 10:12:25 -05:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
7f238f0758
Merge bento-box
2016-03-06 00:04:24 +01:00
80b010b199
SL-109 WIP - minor code cleanup
2016-02-26 16:54:00 -05:00
7bbcfe8541
Merge bento-box
2016-02-24 23:38:26 +01:00
f0b050ff48
merge
2016-02-23 16:44:47 -05:00
a67a01b2a3
MAINT-6162 limit joint offset distances in old style .anim format
2016-02-23 10:47:21 -08:00
f1e6f5c72a
SL-287 WIP - fixed default avatar crash caused by added spine joints. Still renders distorted.
2016-02-23 09:34:40 -05:00
Mnikolenko Productengine