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 'master' into DRTVWR-510Dave Houlton
Merge DRTVWR-460 changes in master (v 6.4.3) into the 510 branch.
2020-05-18DRTVWR-476: Merge branch 'master' of lindenlab/viewer into DRTVWR-476-boost-1.72Nat Goodspeed
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-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-06DRTVWR-476: Merge branch 'master' of lindenlab/viewer into DRTVWR-476-boost-1.72Nat Goodspeed
2020-05-06Merged in euclid-vulkan-detect (pull request #96)Dave Houlton
Report Vulkan capability in stats (Windows-only) Approved-by: Michael Pohoreski
2020-05-06DRTVWR-510 cache vulkan-detect resultDave Houlton
2020-05-06DRTVWR-510: Fix merge conflictPtolemy
2020-05-06DRTVWR-510: Add clarifaction on last rows, add pretty printing for > +/-99K, ↵Ptolemy
more cleanup
2020-05-05DRTVWR-510 add code to report Vulkan capability in stats (Windows-only)Dave Houlton
2020-05-04Merge branch 'master' into DRTVWR-460Andrey Lihatskiy
2020-05-04DRTVWR-510 Cleanup: Remove useless redundant debug lines clear; ↵Ptolemy
updateDebugText() is always called before drawDebugText() which already clears the debug text lines
2020-05-04DRTVWR-510 Cleanup: Add dark background under camera matrice for contrast ↵Ptolemy
when against a white background
2020-05-04DRTVWR-510 Cleanup: Align camera matrices columns for consistent placement ↵Ptolemy
to improve readability
2020-05-04DRTVWR-510 Cleanup: Remove (redundant) last columns from Debug Camera ↵Ptolemy
matrices as they are static.
2020-05-04DRTVWR-510 Cleanup: Fix copy-pasta typo of camera matricesPtolemy
2020-05-04Fixed -Wstring-plus-int related errors for compatibility with Xcode-11.4Brad Kittenbrink
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-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-04-30SL-12898 Added https to allowed audio linksAndrey Kleshchev
2020-04-28DRTVWR-510 Cleanup: Remove useless redundant debug lines clear; ↵Ptolemy
updateDebugText() is always called before drawDebugText() which already clears the debug text lines
2020-04-28DRTVWR-510 Cleanup: Add dark background under camera matrice for contrast ↵Ptolemy
when against a white background
2020-04-28DRTVWR-510 Cleanup: Align camera matrices columns for consistent placement ↵Ptolemy
to improve readability
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-27DRTVWR-510 Cleanup: Remove (redundant) last columns from Debug Camera ↵Ptolemy
matrices as they are static.
2020-04-27SL-12678 Removed auto login retryAndrey Kleshchev
2020-04-26Merge branch 'master' into DRTVWR-460Andrey Lihatskiy
# Conflicts: # indra/llmath/llquaternion.h # indra/newview/lldrawpoolwater.cpp # indra/newview/lljoystickbutton.cpp # indra/newview/llvosky.cpp # indra/newview/skins/default/textures/textures.xml
2020-04-24DRTVWR-510 Cleanup: Fix copy-pasta typo of camera matricesPtolemy
2020-04-23SL-12904 Temporarily use LLSD to avoid crashes on older viewersMnikolenko Productengine
2020-04-22Merged master into DRTVWR-510Dave Houlton
2020-04-22SL-12678 Remove automatic retry of loginAndrey Kleshchev
Cherry-pick the retry disable into DRTVWR-510
2020-04-20Restored SL-12732 after merge conflictAndrey Kleshchev
2020-04-20SL-13040 Fixed crash at EnvironmentPersistAcrossLoginAndrey Kleshchev
2020-04-20Merge branch 'master' into DRTVWR-500Andrey Lihatskiy
# Conflicts: # indra/newview/pipeline.cpp
2020-04-20Merged master into DRTVWR-508Andrey Kleshchev
2020-04-20Increment viewer version to 6.4.1Nat Goodspeed
following promotion of DRTVWR-440
2020-04-20SL-12904 FIXED Camera Preset does not restore correctly when sittingMnikolenko Productengine
2020-04-17Fixed -Wstring-plus-int related errors for compatibility with Xcode-11.4Brad Kittenbrink
2020-04-16SL-12607 Removed spacerAndrey Kleshchev
2020-04-15SL-12607 Rearrange login panelAndrey Kleshchev
2020-04-15SL-13040 Fixed crash at EnvironmentPersistAcrossLoginAndrey Kleshchev
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-13 04:17:55 +0000