Ansariel
|
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 |
|
Dave Parks
|
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 |
|
Ansariel
|
3192fe832f
|
Merge viewer-quickgraphics
|
2016-03-08 01:41:31 +01:00 |
|
Oz Linden
|
c8726aba30
|
remove execute permission from many files that should not have it
|
2015-11-10 09:48:56 -05:00 |
|
Nicky
|
651050e191
|
Proper initialization for return values.
|
2015-04-18 01:19:36 +02:00 |
|
Ansariel
|
546b276eba
|
Fix merge issue
|
2015-01-18 17:18:23 +01:00 |
|
Stinson Linden
|
8392fde6f6
|
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-drtvwr-365.
|
2014-06-02 22:32:16 +01:00 |
|
Stinson Linden
|
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 |
|
Brad Payne (Vir Linden)
|
d58e7cfbfc
|
SH-3455 WIP - removing bake upload code
|
2013-09-19 13:59:20 -04:00 |
|
Brad Payne (Vir Linden)
|
82f147367f
|
SH-3455 WIP - removing bake upload code
|
2013-09-19 11:10:59 -04:00 |
|
Brad Payne (Vir Linden)
|
36bb33b12a
|
sunshine cleanup annotations
|
2013-09-18 17:03:34 -04:00 |
|
Nyx Linden
|
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 |
|
prep
|
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 |
|
Don Kjer
|
1f6e20c5bb
|
Split gl-specific LLViewerTexture implementation into llrender/LLGLViewerTexture
|
2012-09-04 17:43:08 +00:00 |
|
Don Kjer
|
c355fb98d3
|
Extracted texture baking system into llappearance library.
|
2012-09-03 06:12:50 +00:00 |