summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-05-07DRTVWR-476: Help DirectX.cmake cope with multiple SDK versions.Nat Goodspeed
First, get rid of ancient cruft in the find_path() calls: on a 64-bit system, "$ENV{PROGRAMFILES}" expands to the 64-bit 'Program Files' directory rather than the 32-bit 'Program Files (x86)' directory, and none of the ancient cruft would be found there anyway. Empirically, find_path(dxdiag.h) is able to find the file using environment variables (INCLUDE from VS variables?), so it doesn't need the specific pathnames coded into that call. Once we find DIRECTX_INCLUDE_DIR, don't immediately insert it into include_directories: we've had troubles with incompatible Windows SDK versions (compile errors in Microsoft header files!) when DIRECTX_INCLUDE_DIR preceded the Windows SDK directory in the include path. The DIRECTX_FIND_QUIETLY logic seemed backwards: the message(STATUS) output was emitted only when DIRECTX_FIND_QUIETLY was false. Reverse that. The ancient cruft in find_path(dxguid.lib) was causing it to find the wrong (very old) DirectX library. Remove ancient cruft. But empirically, without that, even once we've found DIRECTX_INCLUDE_DIR, CMake could not implicitly find dxguid.lib. If the DirectX directory hierarchy were structured as .../version/Include and .../version/Lib, a relative pathname would have been sufficient hint. Unfortunately it's structured as .../Include/version and .../Lib/version, so a relative pathname would have to include the specific version. Instead, replace "/Include/" with "/Lib/". But even then, we have to drill down to the architecture-specific subdirectory based on ADDRESS_SIZE.
2020-05-07SL-12970 Fixed char length crashAndrey Kleshchev
2020-05-06DRTVWR-476: Add llsd::clone(), llsd::shallow() aliasesNat Goodspeed
for new llsd_clone(), llsd_shallow() functions.
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-06Pull in the newest Dullahan built against the latest CEF. The CEF/Dullahan ↵Callum Prentice
Windows builds are both functionally identical to the last one but the macOS CEF (and hence Dullahan) one is the first to be build entirely from source in TeamCity
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-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-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-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-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
2020-04-28Merged in DRTVWR-460 (pull request #91)Andrey Lihatskiy
SL-13133 Numerical camera preset names sorting order fix Approved-by: Maxim Nikolenko
2020-04-28SL-13133 Numerical camera preset names sorting order fixAndrey Lihatskiy
2020-04-28DRTVWR-476: Update to llca build 541101Nat Goodspeed
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-23SL-12904 Temporarily use LLSD to avoid crashes on older viewersMnikolenko Productengine
2020-04-21AMD CPUs list updateAndrey Lihatskiy
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-16SL-12607 Removed spacerAndrey Kleshchev
2020-04-15SL-12607 Rearrange login panelAndrey Kleshchev
2020-04-14Merged in euclid-13019 (pull request #70)Dave Houlton
SL-13019, fix broken varying linkage on MacOS Approved-by: Michael Pohoreski
2020-04-14SL-13019, fix broken varying linkage on MacOSDave Houlton
2020-04-14SL-12607 WIP, take pre-sized icons from repo instead of packageAndrey Kleshchev
2020-04-13SL-12607 Added more icons and draw methods to draw themAndrey Kleshchev
2020-04-13SL-12993 Focus on avatar after saving new presetMnikolenko Productengine
2020-04-13SL-13029 Fixed load orderAndrey Kleshchev
2020-04-12SL-13029 Environment update was not applying properlyAndrey Kleshchev
2020-04-10SL-12994 FIXED [Camera Presets] Zoom fraction should be saved as a part of ↵Mnikolenko Productengine
Camera preset, not as separate setting
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-28 12:13:30 +0000