summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
AgeCommit message (Collapse)Author
2020-06-23SL-6109 Added default key for voiceandreykproductengine
2020-06-23SL-6109 Remade 'ignore' list processing, renamed and reformed keybindingsandreykproductengine
2020-06-23SL-6109 Removed obsolete control, moved table init to xml, cleanupandreykproductengine
2020-06-23SL-6109 Conflict resolutionandreykproductengine
2020-06-22SL-13416 eliminate sun/moon specular on shadowed surfacesDave Houlton
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-19Merge branch 'master' 6.4.4 into DRTVWR-510Dave Houlton
2020-06-18SL-9632 Fix HUD objects to not use environment lightingPtolemy
2020-06-18SL-9632: Fix most HUD objects incorrectly being effected by the environment ↵Ptolemy
lighting
2020-06-18SL-13163 revert 2 more instances of 'new EEP' specular calculationDave Houlton
2020-06-16SL-13449, fix link errors for class1 soften shadersDave Houlton
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-08SL-13821 shader clean up and formatDave Houlton
2020-06-08SL-13281, add missing srgb->linear conversion for specularDave Houlton
2020-06-05SL-13084: Add references to other common filesPtolemy
2020-06-05SL-13084: Move texture coords section to top in class2/windlight/cloudsV to ↵Ptolemy
match class1/deffered/cloudsV
2020-06-05SL-13084: Fix inverted cloud scroll with ALM is offPtolemy
2020-06-05SL-13804: Fix clouds flipped along East/West axis to match texture preview ↵Ptolemy
Cloud Image and direction to match Cloud Scroll
2020-06-05SL-13084: Fix clouds flipped along East/West axis to match texture preview ↵Ptolemy
Cloud Image and direction to match Cloud Scroll
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-21SL-13163 - Fix (revert) EEP specular contribution calculation for deferredDave Houlton
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 18:26:46 +0000