Commit Graph

32 Commits (2bc4fb2bf0bef5adf709ef1fc90ba1bcdee7f8d0)

Author SHA1 Message Date
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
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) 7b9708a2e3 sunshine-external merge WIP 2014-05-13 10:02:26 -04:00
Nyx Linden b1838f02bc SH-4572 FIX changing clothing parameters do not take effect in edit appearance
fix, new back-end utility and restoring the necessary functionality.
2013-10-25 16:43:36 -04:00
Brad Payne (Vir Linden) dba221e0ac SH-4160 WIP, build fix 2013-10-17 16:12:37 -04:00
Nyx Linden b42c70173c SH-3455 BUILDFIX Updating linux appearance utility to use the new refactor
Eliminated some unnecessary functions that the refactor took care of,
linux build should be fixed.
2013-10-16 15:28:10 -04:00
Richard Linden 697d2e720b renamed TimeBlock to BlockTimerStatHandle 2013-10-15 20:24:42 -07: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
Richard Linden 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
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00
prep 0cda978db9 #include fix 2013-03-11 18:15:40 -04:00
prep 8e3b190e91 merge 2013-03-11 15:17:13 -04:00
prep e0c9174609 merge 2013-03-11 15:05:47 -04:00
prep 207d9fd767 Viewer-chui merge 2013-03-11 14:45:53 -04:00
Brad Payne (Vir Linden) 22f53c8558 additional debugging info, including tracking where visual params live 2012-10-15 18:41:55 -04:00
Don Kjer 19e43e4b58 Added fast timers for baked texture rendering. Updated appearance utility 2012-10-06 08:08:52 +00:00
Don Kjer 8c0aa31536 Adding optimization to skip alpha image analysis when it isn't needed. 2012-10-04 00:42:31 +00:00
Brad Payne (Vir Linden) 93e210d91f more state management stuff, DRANO flags for problematic areas 2012-09-26 15:45:58 -04:00
Brad Payne (Vir Linden) ab83fab72c error checking, comments for areas needing fix/check in appearance 2012-09-26 11:52:19 -04:00
Brad Payne (Vir Linden) ae0bb92290 renamed isUsingBakedTextures to more accurate isUsingServerBakes. Commented some areas we are probably using the function incorrectly 2012-09-26 06:36:24 -04:00
Don Kjer cf7eb79fa7 Removed most llappearance -> llui dependencies (LLTrans remains). Moved LLInventoryIcon::EIconName into LLInventoryType. Moved LLInventoryIcon back to newview. Moved LLUI gl_* functions into llrender. 2012-09-08 04:39:11 +00:00
Don Kjer 1f6e20c5bb Split gl-specific LLViewerTexture implementation into llrender/LLGLViewerTexture 2012-09-04 17:43:08 +00:00
Don Kjer 0c7623f628 Cleanup of llappearance refactor file definition order for easier diff'ing 2012-09-03 08:37:58 +00:00
Don Kjer c355fb98d3 Extracted texture baking system into llappearance library. 2012-09-03 06:12:50 +00:00