| Age | Commit message (Collapse) | Author | 
|---|
|  |  | 
|  |  | 
|  |  | 
|  | # Conflicts:
#	indra/newview/app_settings/shaders/class1/objects/previewV.glsl
#	indra/newview/lldynamictexture.cpp
#	indra/newview/llfloatermodelpreview.cpp | 
|  | following promotion of DRTVWR-440 | 
|  |  | 
|  | The way legacy_header_height works is just wrong... | 
|  |  | 
|  |  | 
|  |  | 
|  | SL-13019, fix broken varying linkage on MacOS
Approved-by: Michael Pohoreski | 
|  |  | 
|  |  | 
|  |  | 
|  | SL-12975, unfix alpha and undo non-fix magic number of refracted portion of water Fresnel | 
|  | water Fresnel | 
|  | SL-10449
Approved-by: Dave Houlton <euclid@lindenlab.com> | 
|  |  | 
|  |  | 
|  |  | 
|  | to compile/link | 
|  | compile/link | 
|  |  | 
|  | SL-11368, fix missing water uniforms for low shader settings
Approved-by: Michael Pohoreski | 
|  |  | 
|  | SL-12852 Cleanup for readability
Approved-by: Dave Houlton <euclid@lindenlab.com> | 
|  |  | 
|  | Fix light falloff being corrupted when editing value via build floater spinner
Approved-by: Dave Houlton | 
|  | Fix editing light color corrupting intensity and color values
Approved-by: Dave Houlton | 
|  | SL-12888 Fix space alpha megaprim not using z-test
Approved-by: Dave Houlton <euclid@lindenlab.com> | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  | SL-12902 Better fix for light color values in color swatch not matching light color values inworld. | 
|  | light color values inworld. | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  | SL-12902 Fix for doing the technically correct but compatibility wrong thing WRT light color values. | 
|  | WRT light color values. | 
|  | Fix infinite loop debug message when debugGL flag is enabled.
Approved-by: Michael Pohoreski | 
|  |  | 
|  | Fix for class2/softenLightF.glsl not matching class1/softenLightF.glsl | 
|  |  |