Commit Graph

42580 Commits (6007475c87d3edbb023cc64bb097d33e6c04dfd4)

Author SHA1 Message Date
Nat Goodspeed ca6f092929 DRTVWR-476: Merge branch 'master' of lindenlab/viewer into DRTVWR-476-boost-1.72 2020-05-06 16:06:26 -04:00
Dave Houlton c19bb9beee DRTVWR-510 cache vulkan-detect result 2020-05-06 23:01:55 +03:00
Callum Prentice c5e41301d1 Pull in the newest Dullahan built against the latest CEF. The CEF/Dullahan 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-06 10:33:30 -07:00
Dave Houlton 85a03549f1 DRTVWR-510 add code to report Vulkan capability in stats (Windows-only) 2020-05-06 02:32:47 +03:00
Callum Prentice f3c95fce80 Pull in a new version of Dullahan that is identical other than a bump in version number 2020-05-05 14:12:51 -07:00
Andrey Kleshchev 53da10525e SL-11445 pulled in fresh fmod studio package 2020-05-05 20:24:17 +03:00
Andrey Kleshchev 05bc927dd8 SL-12607 Revert changes to no longer necessary packages
This packages were needed for icons, but since icons are no longer needed, neither should packages change.
2020-05-05 20:24:17 +03:00
Callum Prentice 27efc55cdb Nonsensical, trivial change to force a build after I ran afoul of a TeamCity buildscripts change 2020-05-04 14:24:28 -07:00
Andrey Lihatskiy 6364e2fff6 Merge branch 'master' into DRTVWR-460 2020-05-04 23:35:54 +03:00
Callum Prentice 691a2d996c Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-512 2020-05-04 10:53:11 -07:00
Andrey Kleshchev 13f501b333 Merged master into DRTVWR-508 2020-05-04 19:34:48 +03:00
Andrey Lihatskiy 7c0f3db180 Merge branch 'master' into DRTVWR-501-maint 2020-05-04 19:20:59 +03:00
Nat Goodspeed 4a7fd0117a Increment viewer version to 6.4.2
following promotion of DRTVWR-500
2020-05-04 12:15:30 -04:00
Callum Prentice 77d2a05921 Pick up first version of new Dullahan build autobuild scripts that builds CEF wrapper first before building Dullahan. Change to version headers meant a change to appviewer.cpp too. 2020-05-03 19:03:22 -07:00
Andrey Kleshchev 2bddce7cab SL-12678 Removed auto login retry 2020-05-01 18:08:10 +03:00
Brad Payne (Vir Linden) b654330f51 SL-12896 - BOM texture settings 2020-05-01 16:55:34 +03:00
Andrey Kleshchev a6b3b98e52 SL-12898 Added https to allowed audio links 2020-04-30 22:11:34 +03:00
Andrey Kleshchev 9c31597e5e SL-13141 Crashfix contribution 2020-04-30 17:51:46 +03:00
Andrey Lihatskiy b6441bf09b Merge branch 'DRTVWR-500' into DRTVWR-501-maint 2020-04-29 19:34:39 +03:00
Callum Prentice 25aa0999c6 Fix for SL-13138 - Remove extraneous additon of dullahan_host.exe that crept in trying to make code signing work 2020-04-28 15:52:13 -07:00
Callum Prentice 1305c03a13 Remove dullahan_host.exe from signing list - doesn't change anything security wise and leads to an extra copy of dullahan_host.exe because of a code signing bug 2020-04-28 15:38:45 -07:00
Callum Prentice b9fcd3dbf9 Pull in the Dullahan package from the DRTVWR-512 branch of the canonical Dullahan repository 2020-04-28 15:37:27 -07:00
Callum Prentice 013f7c9c92 Pull in this viewers version of Dullanan (and CEF) - identical to DRTVWR-509 (aduly swim) for now but will evolve 2020-04-28 13:39:37 -07:00
Callum Prentice 9c78928311 Initial port of the changes from DRTVWR509 (Adult Swim) minus the volume fall-off settings updates 2020-04-28 10:57:17 -07:00
Andrey Lihatskiy d3b10072f4 Merged in DRTVWR-460 (pull request #91)
SL-13133 Numerical camera preset names sorting order fix

Approved-by: Maxim Nikolenko
2020-04-28 17:31:50 +00:00
Andrey Lihatskiy ec77b2e0ea SL-13133 Numerical camera preset names sorting order fix 2020-04-28 19:07:55 +03:00
Nat Goodspeed 4768d092f6 DRTVWR-476: Update to llca build 541101 2020-04-28 10:19:24 -04:00
Andrey Kleshchev 49db074be4 SL-12678 Removed auto login retry 2020-04-27 17:36:47 +03:00
Andrey Lihatskiy a0d7d87355 Merge branch 'master' into DRTVWR-460
# 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-26 21:57:40 +03:00
Mnikolenko Productengine 2ea5c5986a SL-12904 Temporarily use LLSD to avoid crashes on older viewers 2020-04-23 13:22:27 +03:00
Andrey Lihatskiy f20b22e325 AMD CPUs list update 2020-04-21 00:35:19 +03:00
Andrey Kleshchev 231b51f40f Restored SL-12732 after merge conflict 2020-04-20 22:20:16 +03:00
Andrey Kleshchev d9783adba7 SL-13040 Fixed crash at EnvironmentPersistAcrossLogin 2020-04-20 22:03:06 +03:00
Andrey Lihatskiy c757c29c95 Merge branch 'master' into DRTVWR-500
# Conflicts:
#	indra/newview/pipeline.cpp
2020-04-20 21:23:34 +03:00
Andrey Kleshchev 9634bcf488 Merged master into DRTVWR-508 2020-04-20 18:14:37 +00:00
Nat Goodspeed d7f1c88c35 Increment viewer version to 6.4.1
following promotion of DRTVWR-440
2020-04-20 14:09:16 -04:00
Mnikolenko Productengine 74d6e6b65c SL-12904 FIXED Camera Preset does not restore correctly when sitting 2020-04-20 14:27:22 +03:00
Andrey Kleshchev de17c53ae3 SL-12607 Removed spacer 2020-04-16 17:34:29 +03:00
Andrey Kleshchev c49e9baa48 SL-12607 Rearrange login panel 2020-04-15 22:52:28 +03:00
Dave Houlton 693791f4ff Merged in euclid-13019 (pull request #70)
SL-13019, fix broken varying linkage on MacOS

Approved-by: Michael Pohoreski
2020-04-14 19:00:25 +00:00
Dave Houlton ff27f6c8f7 SL-13019, fix broken varying linkage on MacOS 2020-04-14 12:56:40 -06:00
Andrey Kleshchev 032c4a1b49 SL-12607 WIP, take pre-sized icons from repo instead of package 2020-04-14 21:32:10 +03:00
Andrey Kleshchev 347c53855b SL-12607 Added more icons and draw methods to draw them 2020-04-13 22:41:55 +03:00
Mnikolenko Productengine 70d340a1bf SL-12993 Focus on avatar after saving new preset 2020-04-13 20:02:58 +03:00
Andrey Kleshchev ee88ebf9e9 SL-13029 Fixed load order 2020-04-13 17:16:10 +03:00
Andrey Kleshchev 483c459e2e SL-13029 Environment update was not applying properly 2020-04-12 12:02:38 +03:00
Mnikolenko Productengine 944b908be1 SL-12994 FIXED [Camera Presets] Zoom fraction should be saved as a part of Camera preset, not as separate setting 2020-04-10 18:38:56 +03:00
Andrey Kleshchev 1ec8c7a68a SL-12999 List can go out of floater's rect, so it should consume scroll events 2020-04-10 17:06:14 +03:00
Andrey Kleshchev 2542a3ed79 SL-11445 Provide 'name' for Pulse Audio 2020-04-10 17:00:22 +03:00
Andrey Kleshchev f96fb4fe4e SL-12999 Removed unused variables 2020-04-10 15:34:23 +03:00