summaryrefslogtreecommitdiff
path: root/indra/llrender
AgeCommit message (Collapse)Author
2021-03-10Merge branch 'master' v6.4.17 into DRTVWR-528Dave Houlton
2021-03-08Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into ↵Brad Payne (Vir Linden)
DRTVWR-519" This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5.
2021-03-02Merge branch 'master' v6.4.15 into DRTVWR-528Dave Houlton
2021-02-03Merge with Master after Viewer releaseCallum Prentice
2021-02-01DRTVWR-525 fix build error resulting from 6.4.13 mergeDave Houlton
2021-02-01Merge branch 'master' into DV525-merge-6.4.13Dave Houlton
2021-01-06SL-14035: Don't use sRGB textures when not specifiedPtolemy
2020-11-11Merge branch 'master' 6.4.12 into DRTVWR-510Dave Houlton
2020-11-11Merge branch 'master' into DRTVWR-519Callum Prentice
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-10SL-14264 - ViewerStats added logging of most gGLManager fieldsBrad Payne (Vir Linden)
2020-10-23SL-14150 Fix spellingAndrey Kleshchev
2020-10-22SL-14150 Handle more cases of corrupted cacheAndrey Kleshchev
2020-10-20SL-14108 FIXED Viewer crashes immediately after loginMnikolenko Productengine
2020-10-19DRTVWR-510 clean up obsolete downstream-from-mDebugGPU codeDave Houlton
2020-10-19DRTVWR-510 remove obsolete mDebugGPU variableDave Houlton
2020-10-08DRTVWR-510 remove all LL_SOLARIS conditionalsDave Houlton
2020-09-29Merge branch 'master' 6.4.10 into DRTVWR-510Dave Houlton
2020-09-28Merge with tip of ReleaseCallum Prentice
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-17The folder where the disk cache lives was originally renamed from llvfs to ↵Callum Prentice
llcache but @henri's suggestion that that doesn't reflect the other files in the same place and it should be llfilesystem is a good one so I changed it over
2020-09-16First part of change to remove LLVFS from the Viewer. Consists of code ↵Callum Prentice
changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change.
2020-08-18Merge branch 'master' 6.4.8 into DRTVWR-497Dave Houlton
2020-08-18Merge branch 'master' 6.4.8 into DRTVWR-510Dave Houlton
2020-08-18Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llimprocessing.cpp # indra/newview/llviewerjoystick.cpp # indra/newview/llviewermenufile.cpp
2020-08-18Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
2020-08-05SL-13521, clang-format LLRender::syncLightState() (whitespace)Dave Houlton
2020-08-05SL-13521, stamp out some remaining hard-coded 8sDave Houlton
2020-08-04SL-13521 add an avatar appearance light to deferred modeDave Houlton
2020-07-23Merge branch 'master' v6.4.6 into DRTVWR-497Dave Houlton
2020-07-21Merge master 6.4.6 into DRTVWR-510Dave Houlton
Includes the conversion to VS2017 build tools.
2020-07-21Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
# Conflicts: # indra/llcommon/llerror.cpp # indra/newview/llappviewerwin32.cpp # indra/newview/llimprocessing.cpp # indra/newview/llviewerjoystick.cpp
2020-07-21Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml
2020-07-20Merge branch 'master' into DRTVWR-501-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/newview/llimprocessing.cpp
2020-07-06SL-13404 FIXED Formatted text on notecards doesn't display - MacMnikolenko Productengine
2020-06-29DRTVWR-497 Cleanup: Document which enum order comes fromPtolemy
2020-06-11SL-13281, add missing srgb->linear conversion for specularDave Houlton
2020-06-08SL-13281, add missing srgb->linear conversion for specularDave Houlton
2020-05-29SL-13348 Thread crashing singleton #2Andrey Kleshchev
Reverted LLImage to singleton conversion
2020-05-07SL-12970 Fixed char length crashAndrey Kleshchev
2020-05-06DRTVWR-476: Merge branch 'master' of lindenlab/viewer into DRTVWR-476-boost-1.72Nat Goodspeed
2020-05-05Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
2020-05-04Merge branch 'master' into DRTVWR-497Andrey Lihatskiy
2020-05-04DRTVWR-510: Cleanup: Add link for Optimus global variable for nVidia driver.Ptolemy
2020-05-04SL-13019: Add debug logging of shaders used to track down macOSX / OSX GLSL ↵Ptolemy
linker errors
2020-05-04Cleanup to coding standardPtolemy
2020-04-29SL-13121 fixed typo errorMnikolenko Productengine
2020-04-27Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
2020-04-21Fix for 'release' configurationAndrey Kleshchev
llassert is not used in 'release' configuration and build fails due to unused tex_index
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 08:50:14 +0000