summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2020-03-18Merge master (v 6.3.9) into DRTVWR-440Dave Houlton
2020-03-18Increment viewer version to 6.3.9Nat Goodspeed
following promotion of DRTVWR-481
2020-03-17SL-10449 remove soft gamma adjustment that breaks Mac GLSL compilerDave Houlton
2020-03-17Merged in SL-12574_tweak_brightness (pull request #39)Michael Pohoreski
SL-12574: Tweak sky cubemap to not be as dark to better match Windlight Approved-by: Dave Houlton <euclid@lindenlab.com>
2020-03-17SL-12858 Fixed bad mergeAndrey Kleshchev
2020-03-16SL-12574: Tweak sky cubemap to not be as dark to better match WindlightPtolemy
2020-03-16Add missing fullbrightAtmosTransportFrag stub.Runitai Linden
2020-03-13Merged in davep/DRTVWR-440 (pull request #36)Dave Parks
SL-12005 Fix for projectors getting brighter when switching to single light shader.
2020-03-13SL-12005 Fix for projectors getting brighter when switching to single light ↵Runitai Linden
shader.
2020-03-13Merged in SL-12781 (pull request #32)Michael Pohoreski
SL-12781 Approved-by: Dave Houlton <euclid@lindenlab.com>
2020-03-13SL-12784 disambiguate vertex_color.a of 0Dave Houlton
2020-03-13SL-12850 Adhere to coding standardPtolemy
2020-03-13SL-12850 remove debugPtolemy
2020-03-13SL-12850Ptolemy
2020-03-13Merged in davep/DRTVWR-440 (pull request #33)Dave Parks
SL-12233 Fix for disagreement between fullbright implementations with ALM on and off.
2020-03-13SL-12233 Fix for disagreement between fullbright implementations with ALM on ↵Runitai Linden
and off.
2020-03-12SL-12781 Remove expensive and redundant z clear; instead enable/disable z ↵Ptolemy
test for background and model preview
2020-03-12SL-12781 Cleanup: Remove HACK / MAGIC NUMBER effective constant of ↵Ptolemy
mCameraDistance as it is set in setPreviewTarget() via initModelPreview()
2020-03-12SL-12781 Cleanup: Rename non-descript generic var namePtolemy
2020-03-12SL-12781 Cleanup: Update out-of-date color commentPtolemy
2020-03-12SL-12781 Fix Upload 3D Preview not using z-bufferPtolemy
2020-03-12SL-12784 restore vertex color alpha contributionDave Houlton
2020-03-12DRTVWR-440 fix 'unreachable code' warning-as-error when buildin /OdDave Houlton
2020-03-10Merged in SL-12779Andrey Lihatskiy
2020-03-10SL-12779 [EEP] Fix for cropped buttons in 'Edit Day Cycle' floaterAndrey Lihatskiy
2020-03-10SL-12171 Fix emissive mask being too bright post sRGB/Linear cleanupPtolemy
2020-03-10DRTVWR-440 Add compile switch SHADER_CRASH_NONFATAL to prevent app exit on ↵Dave Houlton
shader failure
2020-03-10SL-12592, avoid light modulation of fullbright and preserve diffuse alpha ↵Dave Houlton
component
2020-03-10SL-12817 New text for snapshot uploadAndrey Kleshchev
2020-03-06SL-12574 Fix EEP cubemap not matching non-EEP for both ALM on and offPtolemy
2020-03-06Fix for mismatch on angular attenuation between sunlight on opaque and ↵Runitai Linden
transparent objects from last commit.
2020-03-06Fix for sunlight having improper gamma curve for angular attenuation. Fix ↵Runitai Linden
for lack of angular attenuation on ambient lighting on triangles facing away from sun.
2020-03-06Fix for sky in wrong color space.Runitai Linden
2020-03-06Fix for under water being much brighter and mismatching between alpha and ↵Runitai Linden
deferred. Don't make terrain fullbright under water.
2020-03-06Merge branch 'DRTVWR-440' of bitbucket.org:lindenlab/viewer into ↵Runitai Linden
davep/BUG-228263
2020-03-05WIP - Windlight sun lighting should happen in sRGB space, not linear space. ↵Runitai Linden
This keeps ambient from getting overblown and better matches environment lighting with ALM on/off.
2020-03-05Merged in fix for SL-9775Maxim Nikolenko
2020-03-05Reenable water fog in materialF.glsl (oops)Runitai Linden
2020-03-05SL-9775 FIXED EEP viewer crash when looking at the sun (which is playing ↵maxim_productengine
parcel media)
2020-03-04Fix line endings?Runitai Linden
2020-03-04Merge fixRunitai Linden
2020-03-04Merge branch 'DRTVWR-440' of bitbucket.org:lindenlab/viewer into ↵Runitai Linden
davep/BUG-228263
2020-03-04Changes somehow missing from last commitRunitai Linden
2020-03-04WIP - fix various inconsistencies in sRGB vs linear color space. Fix ↵Runitai Linden
inconsistencies between softenLightF.glsl, materialF.glsl, and alphaF.glsl
2020-03-04Roll back SL-12006 commits to materialF.glsl (Dec23)Dave Houlton
2020-03-03Revert 2 merges (PR#13, PR#16) related to SL-12638Dave Houlton
This reverts commits 9d9b890 and 5f846e4.
2020-03-02SL-11273 FIXED [EEP] The beacon checkboxes in the Day Cycle window can only ↵maxim_productengine
be changed while a keyframe is selected.
2020-03-02SL-12755 [EEP] The sky level dropdown is not disabled for foldersAndrey Kleshchev
2020-02-28SL-12638, further tweaking of normal-map lighting, add some de-saturationDave Houlton
2020-02-27SL-12739 FIXED [EEP] Viewer is crashed after clicking the "Forget" button on ↵maxim_productengine
the Experience Profile after the llSetAgentEnvironment was used