summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2020-05-08SL-13161 Fixed notificationAndrey Kleshchev
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-07SL-13119 Fixed label updatesAndrey 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-06mergeBrad Payne (Vir Linden)
2020-05-06SL-13000 - animation state mgmt for jellied pseudo-humansBrad Payne (Vir Linden)
2020-05-06SL-13132 Emphasize parcel name over region name in Landmarks and Place ProfilesAndrey Kleshchev
2020-05-06DRTVWR-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-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-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-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-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-28SL-13119 Duplicate check was causing slowdownsAndrey Kleshchev
2020-04-28SL-13119 Optimize initialization of inventory viewsAndrey Kleshchev
2020-04-28SL-12298 Convert LLSettingsType to an LLSINGLETON variantMnikolenko Productengine
2020-04-27SL-13018 FIXED Chat Transcripts not showing on right click when encoding of ↵Mnikolenko Productengine
text file is UTF-8 with BOM
2020-04-27SL-12678 Removed auto login retryAndrey Kleshchev
2020-04-27SL-12678 Removed auto login retryAndrey Kleshchev
2020-04-27Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
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-25SL-13123 CleanupAndrey Kleshchev
2020-04-24SL-13000 - no attachments or joint pos overrides for jellydollsBrad Payne (Vir Linden)
2020-04-24SL-13123 Bind shape matrix orientation warning is misbehavingAndrey Kleshchev