summaryrefslogtreecommitdiff
path: root/indra/newview/pipeline.cpp
AgeCommit message (Collapse)Author
2021-05-26SL-15299 SL-15313 BUG-230802 Revert BOM fix causing issues with avatar alpha ↵Dave Houlton
masks. Revert "SL-12069 Issues with bakes-on-mesh and alpha modes" This reverts commit 5691d302ef876a7e6fb6861441f14e5e7f0c7735.
2021-04-29Merge master into DV525-merge-6.4.19Dave Houlton
2021-02-17Merge branch 'master' v6.4.14 into DV525-merge-6.4.14Dave Houlton
2021-02-17Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-02-01Merge branch 'master' into DV525-merge-6.4.13Dave Houlton
2021-02-01Merge branch 'master' of https://bitbucket.org/lindenlab/viewer/src/master ↵Andrey Kleshchev
into DRTVWR-515-maint # Conflicts: # autobuild.xml (llca) # indra/llwindow/llwindow.h (SL-13507 vs SL-5894) # indra/newview/llscenemonitor.cpp (SL-14422) # indra/newview/llvovolume.cpp (SL-12069)
2021-02-01Merge remote-tracking branch 'origin/master' into DRTVWR-517Brad Payne (Vir Linden)
2020-12-10SL-12069 Issues with bakes-on-mesh and alpha modesAndrey Kleshchev
2020-12-09Revert "SL-12069 Issues with bakes-on-mesh and alpha modes"Andrey Kleshchev
This reverts commit afd734b5f4ba66204f80f7726aa5fec538fcf1e4. Fix will be updated and moved to DRTVWR-515.
2020-11-13Merge remote-tracking branch 'origin/master' into DRTVWR-517Brad Payne (Vir Linden)
2020-11-11Merge branch 'master' 6.4.12 into DRTVWR-510Dave Houlton
2020-11-11SL-14275: Comment out unused global consts for compilers that treat this an ↵Ptolemy
an error
2020-11-11Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/llui/llfolderviewmodel.h # indra/newview/lltexturecache.cpp # indra/newview/llviewermenu.h # indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
2020-11-09SL-14275: Replace enum with S32 to better match reflection_detailPtolemy
2020-11-05SL-14275: Cleanup: Detabify generateWaterReflection()Ptolemy
2020-11-05SL-14275: Cleanup: Add indentation for some push/pop RenderTypeMask()Ptolemy
2020-11-05SL-14275: Implement two new water reflection modesPtolemy
2020-11-05SL-14275: Cleanup DetabifyingPtolemy
2020-11-05SL-14275: Don't render clouds in water reflectionPtolemy
2020-11-05SL-14275: Cleanup inconsistent indentationPtolemy
2020-11-05SL-14275: Cleanup non descript name for water reflection modePtolemy
2020-10-20SL-14142 - impostor management cleanupBrad Payne (Vir Linden)
2020-10-19DRTVWR-510 clean up obsolete downstream-from-mDebugGPU codeDave Houlton
2020-10-19mergeBrad Payne (Vir Linden)
2020-10-16SL-14130 Jellydolls have wrong appearance when non-impostors is uncappedAndrey Kleshchev
2020-10-15Merge remote-tracking branch 'origin/master' into DRTVWR-517Brad Payne (Vir Linden)
2020-10-15SL-14130 - WIP, notes on impostor state managementBrad Payne (Vir Linden)
2020-10-14Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
2020-10-14Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llfloatermodelpreview.cpp
2020-10-09SL-13699 FIXED The sky settings are changed after entering the 'Editing ↵Mnikolenko Productengine
Appearance' mode
2020-09-29SL-12743 Restored the commit lost during the mergeAndrey Lihatskiy
2020-09-28Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llgroupmgr.cpp
2020-09-28Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # indra/newview/pipeline.cpp
2020-09-28Merge remote-tracking branch 'origin/master' into DRTVWR-517Brad Payne (Vir Linden)
2020-09-28Merged master(DRTVWR-497) into DRTVWR-482Andrey Kleshchev
2020-09-21SL-13522 remove injected character lights to improve alpha blendDave Houlton
Character lights injected during render pass while in character edit mode (i.e. mSpecialRenderMode == 3) were causing discrepencies between deferred (ALM) and forward alpha blend lighting.
2020-08-27SL-13721 Cleanup saved matrix namesPtolemy
2020-08-26SL-13721 Fix incorrect water reflectionPtolemy
2020-08-04SL-13521, clang-format renderDeferredLighting() for consistencyDave Houlton
2020-08-04SL-13521 add an avatar appearance light to deferred modeDave Houlton
2020-07-29SL-13406 fix an end-scope enable error in glow renderingDave Houlton
2020-07-24SL-13406, cleanup and format changesDave Houlton
2020-07-24SL-13406, disable glow no longer disables all post passesDave Houlton
2020-07-02SL-12069 Issues with bakes-on-mesh and alpha modesAndrey Kleshchev
2020-06-03SL-863 Fixed missing render maskAndrey Kleshchev
2020-05-14SL-12014 fixed transparency issues caused by merge with eepAndrey Kleshchev
2020-05-14Revert SL-8191 due to it no longer being validAndrey Kleshchev
This reverts commit 4c006e76e39a8b59dc6f9c890e5a27d38b5ece50. Since EEP there are no 'basic shaders' and doing this in llfloatersettingsdebug was wrong either way
2020-05-13SL-12007 Toggling 'Transparent water' checkbox has no effectAndrey Kleshchev
Opaque water is not compatible with ALM
2020-05-13SL-13000 - jellydoll param managementBrad Payne (Vir Linden)
2020-05-06mergeBrad Payne (Vir Linden)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 08:53:59 +0000