summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2020-05-20Remove DirectX.cmake. With recent SDKs (dating back to at least VS 2013Nicky Dasmijn
and the 8.1 SDK) DirectX is included in the SDK and does not need any special detection logic.
2020-05-19Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
2020-05-19SL-13273 Updated the SL logo imagesAndrey Lihatskiy
2020-05-19SL-13273 Updated the SL logo imagesAndrey Lihatskiy
2020-05-19SL-12896 BOM texture settings - replaced isRiggedMesh() call with faster checkAndrey Lihatskiy
2020-05-19SL-12904 Restored the missing code (post-merge)Andrey Lihatskiy
2020-05-19Merge branch 'master' into DRTVWR-482Andrey Lihatskiy
2020-05-18Merge branch 'master' into DRTVWR-501-maintAndrey Lihatskiy
# Conflicts: # indra/llxml/llcontrolgroupreader.h # indra/newview/llviewerkeyboard.cpp
2020-05-18DRTVWR-476: Merge branch 'master' of lindenlab/viewer into DRTVWR-476-boost-1.72Nat Goodspeed
2020-05-18Merged master into DRTVWR-497Andrey Kleshchev
2020-05-18Merged master into DRTVWR-508Andrey Kleshchev
2020-05-18Increment viewer version to 6.4.3Nat Goodspeed
following promotion of DRTVWR-460
2020-05-15Tiny text change in the about box - indicates CEF and Chromium are ↵Callum Prentice
sub-components
2020-05-15SL-12237 Remade updates for invisible avatarsAndrey Kleshchev
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-14SL-12237 Remade updates for invisible avatarsAndrey Kleshchev
2020-05-14SL-12026 Fix issue with constant bridge recreation for animeshesAndrey Kleshchev
2020-05-14SL-12014 fixed transparency issues caused by merge with eepAndrey Kleshchev
2020-05-14SL-12014 fixed wrong pool type checkAndrey 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-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-12SL-13189 Mesh uploader - Autofill from _postfixesMnikolenko Productengine
2020-05-12SL-13064 Reverted changes that were causing Artifacts at HD620Andrey Kleshchev
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-06DRTVWR-510 cache vulkan-detect resultDave Houlton
2020-05-06DRTVWR-510 add code to report Vulkan capability in stats (Windows-only)Dave Houlton
2020-05-05SL-13178 Improve initial opening time of the landmarks floaterMnikolenko Productengine
2020-05-05SL-12527 cursor is not changed to the pointer on the MoTD link when teleportingAndrey Kleshchev
2020-05-05BuildfixAndrey Lihatskiy
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-482Andrey Lihatskiy
2020-05-04Merge branch 'master' into DRTVWR-497Andrey Lihatskiy
2020-05-04Merge branch 'master' into DRTVWR-460Andrey Lihatskiy
2020-05-04Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-512Callum Prentice
2020-05-04Merged master into DRTVWR-508Andrey Kleshchev
2020-05-04Merge branch 'master' into DRTVWR-501-maintAndrey Lihatskiy
2020-05-04Increment viewer version to 6.4.2Nat Goodspeed
following promotion of DRTVWR-500
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.
2020-05-01SL-12678 Removed auto login retryAndrey Kleshchev
2020-05-01SL-12896 - BOM texture settingsBrad Payne (Vir Linden)
2020-04-30SL-12898 Added https to allowed audio linksAndrey Kleshchev
2020-04-30SL-13141 Crashfix contributionAndrey Kleshchev
2020-04-29Merge branch 'DRTVWR-500' into DRTVWR-501-maintAndrey Lihatskiy
2020-04-28Fix for SL-13138 - Remove extraneous additon of dullahan_host.exe that crept ↵Callum Prentice
in trying to make code signing work
2020-04-28Remove dullahan_host.exe from signing list - doesn't change anything ↵Callum Prentice
security wise and leads to an extra copy of dullahan_host.exe because of a code signing bug
2020-04-28Initial port of the changes from DRTVWR509 (Adult Swim) minus the volume ↵Callum Prentice
fall-off settings updates
2020-04-28SL-13133 Numerical camera preset names sorting order fixAndrey Lihatskiy
2020-04-27SL-12678 Removed auto login retryAndrey Kleshchev
2020-04-27SL-12678 Removed auto login retryAndrey Kleshchev
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-09 02:49:27 +0000