summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-06DRTVWR-510 add code to report Vulkan capability in stats (Windows-only)Dave Houlton
2020-05-05Pull in a new version of Dullahan that is identical other than a bump in ↵Callum Prentice
version number
2020-05-05DRTVWR-510 add code to report Vulkan capability in stats (Windows-only)Dave Houlton
2020-05-05Fixed conflict caused by SL-13178Andrey Kleshchev
2020-05-05SL-13178 Improve initial opening time of the landmarks floaterMnikolenko Productengine
2020-05-05SL-11445 pulled in fresh fmod studio packageAndrey Kleshchev
2020-05-05SL-12607 Revert changes to no longer necessary packagesAndrey Kleshchev
This packages were needed for icons, but since icons are no longer needed, neither should packages change.
2020-05-05SL-13178 Improve initial opening time of the landmarks floaterMnikolenko Productengine
2020-05-05SL-12743 Unified codeAndrey Kleshchev
Fade out for deferred, fixed distance, reused non-deferred logic, fixed flicker
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-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-04Nonsensical, trivial change to force a build after I ran afoul of a TeamCity ↵Callum Prentice
buildscripts change
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-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: Add link for Optimus global variable for nVidia driver.Ptolemy
2020-05-04SL-12971: Add logging of Display Devices -- useful on dual GPU machinesPtolemy
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-04SL-13019: Add debug logging of shaders used to track down macOSX / OSX GLSL ↵Ptolemy
linker errors
2020-05-04Cleanup to coding standardPtolemy
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-30SL-13119 Made control settings cached and fixed potential filtering issueAndrey Kleshchev
2020-04-29SL-13119 Moved ineffective function from inventory view creationAndrey Kleshchev
2020-04-29Merge branch 'DRTVWR-500' into DRTVWR-501-maintAndrey Lihatskiy
2020-04-29SL-13121 fixed typo errorMnikolenko Productengine
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-28Pull in the Dullahan package from the DRTVWR-512 branch of the canonical ↵Callum Prentice
Dullahan repository
2020-04-28Pull in this viewers version of Dullanan (and CEF) - identical to DRTVWR-509 ↵Callum Prentice
(aduly swim) for now but will evolve
2020-04-28Initial port of the changes from DRTVWR509 (Adult Swim) minus the volume ↵Callum Prentice
fall-off settings updates