summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-05-04Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2020-05-04Increment viewer version to 6.4.2Nat Goodspeed
following promotion of DRTVWR-500
2020-04-27SL-12678 Removed auto login retryAndrey Kleshchev
2020-04-21Post-merge build fixAndrey Lihatskiy
2020-04-21Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
# Conflicts: # indra/newview/CMakeLists.txt # indra/newview/llviewerfloaterreg.cpp # indra/newview/skins/default/xui/de/floater_preview_texture.xml # indra/newview/skins/default/xui/es/floater_preview_texture.xml # indra/newview/skins/default/xui/fr/floater_preview_texture.xml # indra/newview/skins/default/xui/it/floater_preview_texture.xml # indra/newview/skins/default/xui/ja/panel_edit_classified.xml # indra/newview/skins/default/xui/ja/panel_me.xml # indra/newview/skins/default/xui/ru/floater_preview_texture.xml # indra/newview/skins/default/xui/tr/floater_picks.xml # indra/newview/skins/default/xui/tr/floater_preview_texture.xml # indra/newview/skins/default/xui/tr/panel_edit_classified.xml # indra/newview/skins/default/xui/tr/panel_me.xml # indra/newview/skins/default/xui/zh/floater_preview_texture.xml
2020-04-21AMD CPUs list updateAndrey Lihatskiy
2020-04-20Restored SL-12732 after merge conflictAndrey Kleshchev
2020-04-20SL-13040 Fixed crash at EnvironmentPersistAcrossLoginAndrey Kleshchev
2020-04-20Merge branch 'master' into DRTVWR-500Andrey Lihatskiy
# Conflicts: # indra/newview/pipeline.cpp
2020-04-20Increment viewer version to 6.4.1Nat Goodspeed
following promotion of DRTVWR-440
2020-04-14Merged in euclid-13019 (pull request #70)Dave Houlton
SL-13019, fix broken varying linkage on MacOS Approved-by: Michael Pohoreski
2020-04-14SL-13019, fix broken varying linkage on MacOSDave Houlton
2020-04-13SL-13029 Fixed load orderAndrey Kleshchev
2020-04-12SL-13029 Environment update was not applying properlyAndrey Kleshchev
2020-04-10Merged in euclid-12975 (pull request #65)Dave Houlton
SL-12975, unfix alpha and undo non-fix magic number of refracted portion of water Fresnel
2020-04-09SL-12975, unfix alpha and undo non-fix magic number of refracted portion of ↵Dave Houlton
water Fresnel
2020-04-07Merged in SL-10449 (pull request #63)Michael Pohoreski
SL-10449 Approved-by: Dave Houlton <euclid@lindenlab.com>
2020-04-07SL-10449: Put first shader error on new line for readabilityPtolemy
2020-04-07SL-10449: Add dumping of shader to log filePtolemy
2020-04-07SL-10449, add missing linkage variable, fix OSX & Intel deferred shaders compDave Houlton
2020-04-07SL-10449 Cleanup dumping shader without LOG spam on every line when it fails ↵Ptolemy
to compile/link
2020-04-07SL-10449 Fix off-by-one line numbers when dumping shader that failed to ↵Ptolemy
compile/link
2020-04-07SL-10449 Fix ALM on OSXPtolemy
2020-04-06Merged in DRTVWR-500 (pull request #60)Andrey Lihatskiy
SL-10993 Fixed Korean font on OSX Catalina Approved-by: Andrey Kleshchev
2020-04-06SL-10993 Fixed Korean font on OSX CatalinaAndrey Lihatskiy
2020-04-03Merged in euclid-11368 (pull request #58)Dave Houlton
SL-11368, fix missing water uniforms for low shader settings Approved-by: Michael Pohoreski
2020-04-03SL-11368, fix missing water uniforms for low shader settingsDave Houlton
2020-04-03Merged in SL-12852 (pull request #57)Michael Pohoreski
SL-12852 Cleanup for readability Approved-by: Dave Houlton <euclid@lindenlab.com>
2020-04-03SL-12852 Cleanup for readabilityPtolemy
2020-04-01Merged in eep-fix-falloff-edit (pull request #54)Rye Mutt
Fix light falloff being corrupted when editing value via build floater spinner Approved-by: Dave Houlton
2020-04-01Merged in eep-fix-light-color (pull request #53)Rye Mutt
Fix editing light color corrupting intensity and color values Approved-by: Dave Houlton
2020-03-31Merged in SL-12888 (pull request #55)Michael Pohoreski
SL-12888 Fix space alpha megaprim not using z-test Approved-by: Dave Houlton <euclid@lindenlab.com>
2020-03-30Update falloff fix with changes requested in review.Rye Mutt
2020-03-30SL-12888 Fix space alpha megaprim not using z-testPtolemy
2020-03-30Fix light falloff being corrupted when editing value via build floater spinnerRye Mutt
2020-03-30Fix editing light color corrupting intensity and color valuesRye Mutt
2020-03-27Merged in davep/DRTVWR-440 (pull request #52)Dave Parks
SL-12902 Better fix for light color values in color swatch not matching light color values inworld.
2020-03-27SL-12902 Better fix for light color values in color swatch not matching ↵Runitai Linden
light color values inworld.
2020-03-27DRTVWR-440, quick fix, add return value - needed for Mac buildDave Houlton
2020-03-27SL-12911 Add Debug setting EnvironmentPersistAcrossLoginAndrey Kleshchev
2020-03-27Removed obsolete and misleading variableAndrey Kleshchev
2020-03-26Merged in davep/DRTVWR-440 (pull request #48)Dave Parks
SL-12902 Fix for doing the technically correct but compatibility wrong thing WRT light color values.
2020-03-26SL-12902 Fix for doing the technically correct but compatibility wrong thing ↵Runitai Linden
WRT light color values.
2020-03-26Merged in euclid_gDebugGL_inf_loop (pull request #46)Dave Houlton
Fix infinite loop debug message when debugGL flag is enabled. Approved-by: Michael Pohoreski
2020-03-26DRTVWR-440, make enabling GLdebug flag slightly less infinite-loopyDave Houlton
2020-03-25Merged in davep/DRTVWR-440 (pull request #47)Dave Parks
Fix for class2/softenLightF.glsl not matching class1/softenLightF.glsl
2020-03-25Fix for class2/softenLightF.glsl not matching class1/softenLightF.glslRunitai Linden
2020-03-24Merged in davep/DRTVWR-440 (pull request #45)Dave Parks
Davep/DRTVWR-440
2020-03-24Merge cleanupRunitai Linden
2020-03-24Merge branch 'DRTVWR-440' of bitbucket.org:lindenlab/viewer into ↵Runitai Linden
davep/DRTVWR-440