summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
AgeCommit message (Collapse)Author
2020-06-29SL-9632 Cleanup: Add note about potential missing inverse pow() texture_gammaPtolemy
2020-06-29SL-9632 Fix Haze effecting HUD objectsPtolemy
2020-06-29SL-9632 Add note about shiny HUD objects that will be fullbright for both ↵Ptolemy
ALM ON and OFF
2020-06-29SL-9632 Add note that shiny HUD objects will be fullbrightPtolemy
2020-06-29Merge branch 'DRTVWR-497' of bitbucket.org:lindenlab/viewer into DRTVWR-497Ptolemy
2020-06-29DRTVWR-497: Cleanup: Document algorithm name for normal packing/unpacking.Ptolemy
2020-06-24Merge branch 'master' into DRTVWR-482Andrey Lihatskiy
2020-06-24Merge branch 'master' into DRTVWR-497Andrey Lihatskiy
2020-06-24Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/llcommon/llkeybind.cpp # indra/llcommon/llkeybind.h
2020-06-19SL-9632 Fix HUD objects to not use environment lightingPtolemy
2020-06-19SL-9632: Fix most HUD objects incorrectly being effected by the environment ↵Ptolemy
lighting
2020-06-13SL-13084 Combined commit for the EEP specular color fixDave Houlton
SL-13084: Fix clouds flipped along East/West axis to match texture preview Cloud Image and direction to match Cloud Scroll SL-13804: Fix clouds flipped along East/West axis to match texture preview Cloud Image and direction to match Cloud Scroll SL-13084: Fix inverted cloud scroll with ALM is off SL-13084: Move texture coords section to top in class2/windlight/cloudsV to match class1/deffered/cloudsV SL-13084: Add references to other common files
2020-06-11SL-13821 shader clean up and formatDave Houlton
2020-06-11SL-13281, add missing srgb->linear conversion for specularDave Houlton
2020-06-02Merge branch 'master' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/newview/CMakeLists.txt # indra/newview/viewer_manifest.py
2020-06-02Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-512Callum Prentice
2020-06-02Merged master into DRTVWR-482Andrey Kleshchev
2020-06-02Merged master into DRTVWR-497Andrey Kleshchev
2020-05-20Fix for SL-13125 Update MediaRollOff values for greater range and less ↵Callum Prentice
attenuation
2020-05-19Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
2020-05-19Merge branch 'master' into DRTVWR-482Andrey Lihatskiy
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-22SL-13077 remove floater specific variables from settings.xmlAndrey Kleshchev
2020-04-21SL-13081 Model is unnaturally greyAndrey Kleshchev
2020-04-21Merge branch 'master' into DRTVWR-482Andrey Lihatskiy
# Conflicts: # indra/newview/app_settings/shaders/class1/objects/previewV.glsl # indra/newview/lldynamictexture.cpp # indra/newview/llfloatermodelpreview.cpp
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