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
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
61c56570ab
Merge viewer-eep
2019-08-13 19:05:23 +02: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
eebf1639c7
SL-534 - make handling of other-gender sliders more consistent. Fixes mGroin bug.
2016-11-18 09:39:14 -05:00
4c2144e115
SL-534 - make handling of other-gender sliders more consistent. Fixes mGroin bug.
2016-11-18 09:39:14 -05:00
ef3b8ad594
Merge bento-box
2016-09-28 14:45:26 +02:00
a2875ba53e
merge
2016-09-02 14:34:06 -04:00
4acba68785
Merge bento-box
2016-08-11 00:16:36 +02:00
95d9e85f95
SL-109 - made viewer much less tolerant of bad data in avatar_skeleton.xml or avatar_lad.xml. If either of these is broken, there's no point trying to continue, more informative to just error out with an appropriate message.
2016-08-09 15:24:09 -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
7f904fbcbd
SL-124 - code cleanup
2016-06-27 08:48:15 -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
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
18f21d657c
SL-315 - fixed collision volume scale issue in resetSkeleton()
2016-05-18 17:07:54 -04:00
e8afa4c413
SL-315 - fixed collision volume scale issue in resetSkeleton()
2016-05-18 17:07:54 -04:00
f6e502b6ef
Merge bento-box
2016-05-18 20:34:55 +02:00
182f2a4815
SL-315 - resetSkeleton(), working for bones at least partially, still some issues with collision volumes
2016-05-11 16:08:25 -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
dd1a86c20c
Merge bento-box
2016-02-12 19:52:34 +01:00
ef02c9ea69
SL-315 - context strings, comments, debugging. joint_test temporarily disabled.
2016-02-03 08:59:25 -05:00
546b276eba
Fix merge issue
2015-01-18 17:18:23 +01:00
2cb14c7fdc
MAINT-4158 WIP - track position overrides requested by attachments so they can be undone intelligently
2014-08-28 17:32:22 -04:00
8392fde6f6
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-drtvwr-365.
2014-06-02 22:32:16 +01:00
0160c514c5
MAINT-4077: Refactoring to add copy constructors to the LLVisualParam class and all of its derived descendants in order to clarify ownership of memory pointers.
2014-05-23 21:56:44 +01:00
7b9708a2e3
sunshine-external merge WIP
2014-05-13 10:02:26 -04:00
697d2e720b
renamed TimeBlock to BlockTimerStatHandle
2013-10-15 20:24:42 -07:00
82f147367f
SH-3455 WIP - removing bake upload code
2013-09-19 11:10:59 -04:00
cbe397ad13
changed fast timer over to using macro
...
another attempt to move mem stat into base class
2013-09-05 14:04:13 -07:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
a2e22732f1
Summer cleaning - removed a lot of llcommon dependencies to speed up build times
...
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
a1fadad9c0
Sh-4321 # Fixes for detach deformations. General code cleanup as well.
2013-07-24 16:01:36 -04:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
77b33d9623
SH-3264 Porting over the XML loading of the avatar structure to llappearance
...
Moved over the necessary classes to llappearance to support the loading of the
avatar's structure & params from file.
2012-09-07 23:17:34 -04:00
Ansariel