summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawpoolterrain.cpp
AgeCommit message (Collapse)Author
2013-10-08merge from viewer-releaseRichard Linden
2013-09-05changed fast timer over to using macroRichard Linden
another attempt to move mem stat into base class
2013-05-09Merge downstream code and viewer-betasimon
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-04-11Merge in downstream code (chui fixes, materials)simon
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-08SH-3959 WIP - pass information about type of fetched image - server bake, ↵Brad Payne (Vir Linden)
host bake, map tile, etc - down the chain so LLTextureFetchWorker can adjust behavior as needed
2013-03-04MAINT-2371 More optimizations.Dave Parks
Reviewed by Graham
2012-09-04Split gl-specific LLViewerTexture implementation into llrender/LLGLViewerTextureDon Kjer
2012-07-03MAINT-685 Fix for disabling basic shaders making high detail terrain render ↵Dave Parks
incorrectly.
2012-06-15Merge with tipcallum
2011-11-17SH-2670 Fix for terrain being wrong detail.Dave Parks
2011-11-10SH-2240 Better fix for red moon -- stop special casing "highlight_color" as ↵Dave Parks
a parameter.
2011-11-07SH-2634 Fix for land overlay not showing colorsDave Parks
2011-10-31SH-2521 Put back "high detail" terrain render when basic shaders disabled ↵Dave Parks
(still broken).
2011-10-26SH-2546 Don't feed vertex color to terrain vertex buffers.Dave Parks
2011-10-20SH-2521 Force terrain to render as simple when GL version < 2.0Dave Parks
2011-10-19SH-2571 Add shader driven render for low detail terrain.Dave Parks
2011-09-22SH-2244 Fix "RenderGLCoreProfile" actually make a core profile context and ↵Dave Parks
modify viewer to run under said context without generating errors.
2011-09-17SH-2243 work in progress -- gDEBugger guided removal of deprecated state changesDave Parks
2011-09-16SH-2243 work in progress -- don't use deprecated shader stateDave Parks
2011-09-14SH-2243 work in progress -- application side matrix stack managementDave Parks
2011-08-08SH-2242 Work in progress migrating to glVertexAttrib everywhereDave Parks
2011-07-05SH-1951 Fix for show land owners not working when basic shaders enabled.Dave Parks
2010-10-10VWR-21967 There's lots of ::renderForSelect() code that we don't need any more.Tofu Linden
VWR-22088 Remove underlying ::renderForSelect() code (render-pipeline)
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2009-11-03fix the bug that textuer boost level is mixed with boolean numbers.Xiaohong Bao
2009-09-22Merging render-pipeline-6-qa-2 into viewer-2David Parks
Self reviewed.
2009-08-24merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3Richard Nelson
DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684 improved text editor (handles multiple fonts simultaneously as well as inline widgets)
2009-07-10merge QAR-1579: texture-cleanup-1.Xiaohong Bao
2009-02-18Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 ↵Brad Kittenbrink
(maint-render-9) and QAR-1236 (dll-msvcrt-2) svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-11-07QAR-992 Merging revisions 101012-101170,101686-101687 of ↵Mark Palange
svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release
2008-06-30Merging in file-move-merge ( QAR-649 )Eric Tulla
Result of "svn merge -r 90669:90786 $tulla/file-move-merge ." Be careful of future merges involving changes to any of these moved files as SVN usually does the wrong thing: newview/llglslshader.* -> llrender/llglslshader.*, llrender/llshadermgr.*, newview/llviewershadermgr.* (gets split into 3 separate files) newview/llpostprocess.* -> llrender/llpostprocess.* newview/llrendersphere.* -> llrender/llrendersphere.* newview/llcubemap.* -> llrender/llcubemap.* llwindow/llgl.* -> llrender/llgl.* llwindow/llglstates.h -> llrender/llglstates.h llwindow/llgltypes.h -> llrender/llgltypes.h llwindow/llglheaders.h -> llrender/llglheaders.h
2008-06-06QAR-650 - Viewer RC 9 merge -> release (post cmake)Steven Bennetts
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
2008-05-09QAR-537 Viewer 1.20 RC 6Steven Bennetts
merge -r 86279:86925 Branch_1-20-Viewer -> release
2008-04-28merge release-QAR-499 Viewer 1.20 RC 3Steven Bennetts
merge release-QAR-508 Viewer 1.20 RC 4 merge Branch_1-20-Viewer -r 85278 : 85828 -> release
2008-04-01merge release@83343 skinning-1-merge@83714 -> releaseSteven Bennetts
QAR-424
2008-02-27Merge of windlight into release (QAR-286). This includes all changes inBrad Kittenbrink
windlight14 which have passed QA (up through r79932). svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
2007-10-04Result of svn merge -r71162:71205 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
2007-03-31svn merge -r 59364:59813 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-02merge release@58699 beta-1-14-0@58707 -> releaseSteven Bennetts
2007-01-03corrected, removed, and updated comments throughout the code to be more ↵Aaron Brashears
useful. no code changes. SL-13762
2007-01-02Print done when done.James Cook
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 10:03:59 +0000