summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawpoolwater.h
AgeCommit message (Collapse)Author
2019-03-13Mods to make merge with viewer-release have less whitespace-only change and ↵Graham Linden
fix diffs between EEP and VR.
2019-01-30Eliminate helper GLSL modules depending on further GLSL modules to give ↵Graham Linden
Intel HD x000 compiler a fighting chance. More WIP for edge-specific water shader for 9996.
2018-09-18SL-9685Graham Linden
Make sure legacy opaque water texture ID is assigned so it can be bound for lowest graphics use.
2018-06-13Mods to hook up water settings to water normals for rendering with support ↵Graham Linden
for current to next blending. Modify LLSettingsFoo::buildDefaultFoo to use a static and avoid re-validation of default sky/water/daycycle settings. Remove all references to gSun/MoonTextureId globals (they should come from sky settings now).
2018-06-11Fix water fog consolidation in underwater shaders.Graham Linden
Add plumbing facilities to allow current and next moon textures to be passed to moon shader. Modify moon shader to blend between current and next moon textures by blend factor.
2017-10-13Watter settings active and start of new joystick button type.Rider Linden
2015-11-10remove execute permission from many files that should not have itOz Linden
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2011-09-26SH-2244 changes to run in a core context on AMD hardware without generating ↵Dave Parks
deprecation or performance warnings
2010-11-18automated merge from viewer-development-shiningLoren Shih
2010-11-05SH-410 Opaque Water Project version 2.0Loren Shih
First implementation with UI changes.
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
2010-01-29CID-349Tofu Linden
Checker: UNINIT_CTOR Function: LLDrawPoolWater::LLDrawPoolWater() File: /indra/newview/lldrawpoolwater.cpp just another dead member.
2009-09-22Merging render-pipeline-6-qa-2 into viewer-2David Parks
Self reviewed.
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-03-25merge release@82858 maint-render-2-merge@83010 -> releaseSteven Bennetts
QAR-389
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-02merge release@58699 beta-1-14-0@58707 -> releaseSteven Bennetts
2007-01-02Print done when done.James Cook