summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
AgeCommit message (Collapse)Author
2020-09-29SL-13500 loadShaderFile crashAndrey Kleshchev
2020-09-28Merge with tip of ReleaseCallum Prentice
2020-09-28Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llpanelprimmediacontrols.cpp
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-28Merged master (DRTVWR-497) into DRTVWR-514-keymappingsAndrey Kleshchev
2020-09-26SL-14007 Group icon in "About land" displays wrong iconAndrey Kleshchev
2020-09-25SL-13034 removeMarkerFiles() happens in destructorAndrey Kleshchev
Depends onto SL-13979 for proper logging
2020-09-25SL-13979 Crash of logging system at LLError::Settings::getInstance()Andrey Kleshchev
LLSingleton depends onto logging system, having logging system be based on LLSingleton causes crashes and deadlocks
2020-09-24Complete the change from lldiskcache -> llfilesystem and then addition of ↵Callum Prentice
new lldiskcache implementation
2020-09-22Add SQLite third package to this viewer and pull in the most recent build (3.33)Callum Prentice
2020-09-22Merge branch 'master' v6.4.9 into DRTVWR-497Dave Houlton
2020-09-22Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/llfloaterconversationpreview.cpp # indra/newview/llinventorypanel.h # indra/newview/llmeshrepository.h # indra/newview/llvoicevivox.cpp
2020-09-22Merge branch 'master' into DRTVWR-519Callum Prentice
2020-09-22Merged master(DRTVWR-503) into DRTVWR-514-keymappingsAndrey Kleshchev
2020-09-16Renamed the references to LLVFile and llvfile.* source code plus cmake ↵Callum Prentice
scripts to use a different name - lldiskcache - since that more closely resembles what it is (or will be) now that the VFA is no more
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-09-01Merge branch 'SL-13834' into DRTVWR-513-maintAndrey Lihatskiy
2020-08-26SL-13834 - add preferences info to ViewerStats, only when exiting and ↵Brad Payne (Vir Linden)
different from default
2020-08-24SL-10297 merged 6.4.7Oz Linden
2020-08-20SL-13565, clean up now-orphaned throttling variable and handling codeDave Houlton
2020-08-20SL-13565, remove SL-10625 throttling erroneously applied to all GPUsDave Houlton
Remove the sleep throttle applied in 10625 to work around an Intel GPU driver bug. It was erroneously being applied to all GPUs, and also as of Intel driver 26.20.100.7755 (1/9/2020) it appears that the driver bug no longer exists.
2020-08-18Merge branch 'master' 6.4.8 into DRTVWR-497Dave Houlton
2020-08-18Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2020-08-18Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llimprocessing.cpp
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-13Merge branch 'master' 6.4.7 into DRTVWR-497Dave Houlton
2020-08-11BuildfixAndrey Kleshchev
2020-08-11Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2020-08-11Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
2020-08-11Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
2020-08-11Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/cmake/DirectX.cmake # indra/newview/llviewerparcelmedia.cpp # indra/newview/viewer_manifest.py
2020-08-11Merged master into DRTVWR-514-keymappingsAndrey Kleshchev
2020-08-06SL-13737 Crash when cleaning up uninitialized ndof deviceAndrey Kleshchev
2020-08-05Revert commit bbb16ff97c1dbafa21358dbee8ca686d3c30478e.Andrey Kleshchev
This fails at teamcity due to missing LLTrans, but builds locally without issues. Reverting to not hold D501
2020-08-05SL-13704 Move link generation into getReleaseNotes()Andrey Kleshchev
2020-08-05Merge branch 'DRTVWR-476' into DRTVWR-501-maintAndrey Lihatskiy
2020-07-30SL-13704 Release notes link not loading in ToolsUpdate2 releaseAndrey Kleshchev
2020-07-23Merge branch 'master' v6.4.6 into DRTVWR-497Dave Houlton
2020-07-21Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
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-17SL-13507 Viewer should log resolution of all associated displaysMnikolenko Productengine
2020-07-10Merged in SL-12090 (pull request #105)Andrey Lihatskiy
SL-12090 Initialize the joystick only when required * SL-12090 Initialize the joystick only when required Approved-by: Andrey Kleshchev
2020-06-23DRTVWR-476: Merge branch 'master' of lindenlab/viewer into d476Nat Goodspeed
following release of D512.
2020-06-24Merge branch 'master' into DRTVWR-497Andrey Lihatskiy
2020-06-24Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
2020-06-24Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-24 01:40:49 +0000