summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
AgeCommit message (Collapse)Author
2020-05-18Merge branch 'master' into DRTVWR-501-maintAndrey Lihatskiy
# Conflicts: # indra/llxml/llcontrolgroupreader.h # indra/newview/llviewerkeyboard.cpp
2020-05-18Merged master into DRTVWR-497Andrey Kleshchev
2020-05-18Merged master into DRTVWR-508Andrey Kleshchev
2020-05-05Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llinventorybridge.cpp # indra/newview/llinventorypanel.cpp # indra/newview/lltexturectrl.cpp # indra/newview/skins/default/xui/de/floater_texture_ctrl.xml # indra/newview/skins/default/xui/es/floater_texture_ctrl.xml # indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml # indra/newview/skins/default/xui/it/floater_texture_ctrl.xml # indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml # indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml # indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml # indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml # indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
2020-04-29Merge branch 'DRTVWR-500' into DRTVWR-501-maintAndrey Lihatskiy
2020-04-26Merge branch 'master' into DRTVWR-460Andrey Lihatskiy
# Conflicts: # indra/llmath/llquaternion.h # indra/newview/lldrawpoolwater.cpp # indra/newview/lljoystickbutton.cpp # indra/newview/llvosky.cpp # indra/newview/skins/default/textures/textures.xml
2020-04-23SL-12904 Temporarily use LLSD to avoid crashes on older viewersMnikolenko Productengine
2020-04-20Merge branch 'master' into DRTVWR-497Andrey Lihatskiy
2020-04-20Merged master into DRTVWR-508Andrey Kleshchev
2020-04-20SL-12904 FIXED Camera Preset does not restore correctly when sittingMnikolenko Productengine
2020-04-14SL-13019, fix broken varying linkage on MacOSDave Houlton
2020-04-09SL-12975, unfix alpha and undo non-fix magic number of refracted portion of ↵Dave Houlton
water Fresnel
2020-04-07SL-10449, add missing linkage variable, fix OSX & Intel deferred shaders compDave Houlton
2020-04-07SL-10449 Fix ALM on OSXPtolemy
2020-04-03SL-12852 Cleanup for readabilityPtolemy
2020-03-25Fix for class2/softenLightF.glsl not matching class1/softenLightF.glslRunitai Linden
2020-03-24Merge cleanupRunitai Linden
2020-03-24Merge branch 'DRTVWR-440' of bitbucket.org:lindenlab/viewer into ↵Runitai Linden
davep/DRTVWR-440
2020-03-24Fix for bad fullbright shiny shininess values and inconsistency between ↵Runitai Linden
materialF and fullbrightShinyF
2020-03-20WIP - Make EEP match production.Runitai Linden
2020-03-19Merged in SL-11589 (pull request #44)Michael Pohoreski
SL-11589 Approved-by: Dave Houlton <euclid@lindenlab.com>
2020-03-19SL-12871 'Only Friends and Groups can call or IM me' setting should be ↵Mnikolenko Productengine
account based.
2020-03-19SL-11589 Remove redundant setting vary_texcoord0, cleanup groupingPtolemy
2020-03-19SL-11589 Fix clouds drooping below horizonPtolemy
2020-03-18SL-12574 Add note about duplicated procedurally generated sky texturePtolemy
2020-03-18SL-12865, add bias to alpha mask values to avoid 8-bit acneDave Houlton
2020-03-17SL-10449 remove soft gamma adjustment that breaks Mac GLSL compilerDave Houlton
2020-03-16Add missing fullbrightAtmosTransportFrag stub.Runitai Linden
2020-03-16SL-4495 Add setting to ignore Hover height when setting Camera positionmaxim_productengine
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-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-12784 restore vertex color alpha contributionDave Houlton
2020-03-10SL-12171 Fix emissive mask being too bright post sRGB/Linear cleanupPtolemy
2020-03-10SL-12592, avoid light modulation of fullbright and preserve diffuse alpha ↵Dave Houlton
component
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-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-05Reenable water fog in materialF.glsl (oops)Runitai Linden
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 06:12:02 +0000