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
02c3d2fe9b
Merge viewer-eep
2019-07-12 21:08:13 +02:00
576f1cdd7e
SL-11521, SL-10625
...
Try aligning data used for glReadPixels to see if we can coax the Intel driver stack into being a less souciant pile of detritus.
Replace face color based test replaced with other logic in error.
2019-07-01 17:23:59 -07:00
f6e502b6ef
Merge bento-box
2016-05-18 20:34:55 +02:00
d0dea44c01
SL-315 - resetSkeleton(). Still some small scale discrepancies, visually pretty good.
2016-05-12 10:57:08 -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
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
a2a6bf20d7
merge with release
2013-06-20 16:46:23 -07:00
88553c9eb1
Cleanup rollback and try point MIPs experiment to see if that's what is hosing the Mac on 10.6.8
2013-06-12 12:19:48 -07:00
d2b253f1f6
Changes to protect against use of normalize3fast on degenerate vectors
2013-06-12 09:16:19 -07:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
11fe124ae9
merging in viewer-beta.
...
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
2013-01-24 16:22:49 -05:00
e0432f98ee
SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance.
2012-11-28 16:36:34 -05: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