summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
AgeCommit message (Collapse)Author
2020-11-11Merge branch 'master' 6.4.12 into DRTVWR-510Dave Houlton
2020-10-19DRTVWR-510 clean up obsolete downstream-from-mDebugGPU codeDave Houlton
2020-10-19DRTVWR-510 remove obsolete mDebugGPU variableDave Houlton
2020-10-15SL-13424 Add Rad Games Tools local Telemetry profiler supportPtolemy
2020-10-08DRTVWR-510 remove all LL_SOLARIS conditionalsDave Houlton
2020-09-29SL-13500 loadShaderFile crashAndrey Kleshchev
2020-09-28Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # indra/newview/pipeline.cpp
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-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-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-507-maintAndrey Lihatskiy
2020-08-13Merge branch 'master' 6.4.7 into DRTVWR-497Dave Houlton
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-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-507-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml
2020-07-20Merge branch 'master' into DRTVWR-501-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/newview/llimprocessing.cpp
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-507-maintAndrey Lihatskiy
2020-06-24Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/llcommon/llkeybind.cpp # indra/llcommon/llkeybind.h
2020-06-23Merge branch 'master' into DRTVWR-501-maintAndrey Lihatskiy
2020-06-23Reverted SL-6109 keybinding changesAndrey Kleshchev
Changes were moved to DRTVWR-514
2020-06-16SL-13418 Move and view panel now applies changes on the goAndrey Kleshchev
2020-06-15SL-13418 Added converter from old mouse binding settings to new onesAndrey Kleshchev
2020-05-19Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
2020-05-18SL-12491 semwait_signal crashAndrey Kleshchev
Superficially it looks like mac tried to resume ms_sleep after class got destroyed by regular cleanup.
2020-05-15Tiny text change in the about box - indicates CEF and Chromium are ↵Callum Prentice
sub-components
2020-05-14DRTVWR-476, SL-12204: Fix crash in Marketplace Listings.Nat Goodspeed
The observed crash was due to sharing a stateful global resource (the global LLMessageSystem instance) between different tasks. Specifically, a coroutine sets its mMessageReader one way, expecting that value to persist until it's done with message parsing, but another coroutine sneaks in at a suspension point and sets it differently. Introduce LockMessageReader and LockMessageChecker classes, which must be instantiated by a consumer of the resource. The constructor of each locks a coroutine-aware mutex, so that for the lifetime of the lock object no other coroutine can instantiate another. Refactor the code so that LLMessageSystem::mMessageReader can only be modified by LockMessageReader, not by direct assignment. mMessageReader is now an instance of LLMessageReaderPointer, which supports dereferencing and comparison but not assignment. Only LockMessageReader can change its value. LockMessageReader addresses the use case in which the specific mMessageReader value need only persist for the duration of a single method call. Add an instance in LLMessageHandlerBridge::post(). LockMessageChecker is a subclass of LockMessageReader: both lock the same mutex. LockMessageChecker addresses the use case in which the specific mMessageReader value must persist across multiple method calls. Modify the methods in question to require a LockMessageChecker instance. Provide LockMessageChecker forwarding methods to facilitate calling the underlying LLMessageSystem methods via the LockMessageChecker instance. Add LockMessageChecker instances to LLAppViewer::idleNetwork(), a couple cases in idle_startup() and LLMessageSystem::establishBidirectionalTrust().
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-14Merged 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-05-13SL-12007 Toggling 'Transparent water' checkbox has no effectAndrey Kleshchev
Opaque water is not compatible with ALM
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-05SL-12527 cursor is not changed to the pointer on the MoTD link when teleportingAndrey 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-05-04Merge branch 'master' into DRTVWR-497Andrey Lihatskiy
2020-05-04Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-512Callum Prentice
2020-05-03Pick up first version of new Dullahan build autobuild scripts that builds ↵Callum Prentice
CEF wrapper first before building Dullahan. Change to version headers meant a change to appviewer.cpp too.