phoenix-firestorm/indra/llrender
Nicky 161c1b019f Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip)
Observations and broken stuff so far:
- LLSideTray is gone.
- LLBottomTray is gone.
- LLFloaterSnapshot was changed and gave lots of merge conflicts. Flickr upload will be broken.
- LLNearbyChat is derived from LLPanel now. That broke quite some stuff rearding autohiding and docking of chatbar.
- Profile floaters are gone and all web based now.
- Russian translation gave huge mere conflicts with the new russian xml files from LL. Unmergeable. I took the LL files.
- XUI files in general will need some love and testing.
2012-01-17 17:57:52 +01:00
..
CMakeLists.txt Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
llcubemap.cpp SH-2031 Profile guided optimization of matrix ops 2011-10-07 03:12:11 -05:00
llcubemap.h correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
llfontbitmapcache.cpp correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
llfontbitmapcache.h correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
llfontfreetype.cpp fix for crash on startup (font system not initialized when first creating fonts) 2011-11-29 23:53:28 -08:00
llfontfreetype.h Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
llfontgl.cpp storm-1723: fix character display when a lot of different characters are used 2011-12-15 15:19:50 -05:00
llfontgl.h Added basic font size adjustment pref (needs better desc and additional work in prefs) 2011-08-21 18:00:44 -07:00
llfontregistry.cpp Added basic font size adjustment pref (needs better desc and additional work in prefs) 2011-08-21 18:00:44 -07:00
llfontregistry.h Added basic font size adjustment pref (needs better desc and additional work in prefs) 2011-08-21 18:00:44 -07:00
llgl.cpp SH-1865 FIX -- removed some old non-deferred rendering code that was preventing anti-aliasing from working when GL_ARB_texture_multisample is unsupported 2011-11-16 10:00:41 -08:00
llgl.h SH-1865 FIX -- removed some old non-deferred rendering code that was preventing anti-aliasing from working when GL_ARB_texture_multisample is unsupported 2011-11-16 10:00:41 -08:00
llgldbg.cpp correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
llgldbg.h correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
llglheaders.h SH-2244 Fix for linux build? 2011-09-23 23:39:45 -05:00
llglslshader.cpp SH-2743 Fix for shader compiler error on some GL 3.x implementations. 2011-12-14 17:55:36 -06:00
llglslshader.h SH-2743 Fix for shader compiler error on some GL 3.x implementations. 2011-12-14 17:55:36 -06:00
llglstates.h SH-1006 Quick pass at cutting down the number of redundant GL calls based on data from gDEBugger. 2011-02-17 17:18:57 -06:00
llgltypes.h correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
llimagegl.cpp SH-2240 Make alpha mask cutoff even less aggressive (fix for eyes on Curious Ringtail avatar) 2011-11-16 12:40:51 -06:00
llimagegl.h SH-469 GL_ARB_texture_multisample support 2011-05-24 15:29:33 -05:00
llpostprocess.cpp SH-2243 work in progress -- application side matrix stack management 2011-09-14 16:30:45 -05:00
llpostprocess.h correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
llrender.cpp Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip) 2012-01-17 17:57:52 +01:00
llrender.h SH-1912 Add environment map back into shiny when lighting and shadows enabled. 2011-11-29 17:13:11 -06:00
llrendersphere.cpp SH-2553 Fix for glitches when rendering HUD attachments. 2011-10-06 15:00:14 -05:00
llrendersphere.h SH-2238, SH-2223, SH-SH-2242 glVertexAttrib throughout main render pipeline complete, preview renders and debug displays still pending. Also fixed a render glitch and a crash (JIRAs listed). 2011-08-10 13:01:14 -05:00
llrendertarget.cpp SH-2084 Don't error out on framebuffer mismatch -- probably causing a crash when some post-snapshot or minimize/restore operation gets out of phase. 2011-12-07 16:36:26 -06:00
llrendertarget.h SH-2447, SH-2525, SH-2276 Strip out defunct global illumination code, add accounting for how much memory is taken up by LLRenderTarget, fix crash on login in bindGLIndices (work around driver bug that doesn't respect VAO state WRT to index buffers), remove some unused render targets, remove some unused shaders, make it possible to run a fullscreen session 2011-10-04 02:31:54 -05:00
llshadermgr.cpp Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip) 2012-01-17 17:57:52 +01:00
llshadermgr.h SH-2666 Tweak depth of field optimizations based on resident feedback. 2011-11-10 16:12:50 -06:00
lltexture.cpp correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
lltexture.h correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
llvertexbuffer.cpp Automated merge with http://hg.secondlife.com/viewer-development 2011-11-30 17:57:09 -08:00
llvertexbuffer.h SH-1650 Mitigate memory fragmentation by holding onto and reusing VBOs 2011-10-13 01:19:45 -05:00