Commit Graph

1486 Commits (fc66d0841616f2abbda2e7ea08e62d39cb2df0c2)

Author SHA1 Message Date
Kitty Barnett 3ffdd2cefc Merge branch 'lindenlab/release' into viewer/build 2020-11-15 15:47:47 +01:00
Andrey Lihatskiy 597d777c9f Updated LLCA to codeticket build 551526 2020-11-02 17:54:41 +02:00
Andrey Lihatskiy 4b2a611596 Updated LLCA to codeticket build 550026 2020-10-21 16:20:47 +03:00
Andrey Lihatskiy 5cae545e09 Updated LLCA to codeticket build 549857 2020-10-01 18:34:58 +03:00
Kitty Barnett 3cdb7adaf5 Updated FMOD Studio to v2.01.04 (Windows) 2020-09-26 18:20:10 +02:00
Kitty Barnett 1194328775 Merge branch 'lindenlab/release' into viewer/build 2020-09-26 14:43:06 +02:00
Mnikolenko Productengine 108550e68e SL-13873 update copyright date to 2020 2020-09-25 16:29:05 +03:00
Andrey Lihatskiy 825cfc2b6a Merge branch 'master' into DRTVWR-507-maint
# Conflicts:
#	doc/contributions.txt
#	indra/newview/llfloaterconversationpreview.cpp
#	indra/newview/llinventorypanel.h
#	indra/newview/llmeshrepository.h
#	indra/newview/llvoicevivox.cpp
2020-09-22 23:30:12 +03:00
Andrey Lihatskiy 05b98ec861 Updated apr_suite to codeticket build 548882 2020-09-11 23:57:31 +03:00
Andrey Lihatskiy 128f0833cf Updated LLCA to codeticket build 548269 2020-09-03 20:03:29 +03:00
Andrey Lihatskiy f73eb32b37 Updated LLCA to codeticket build 548269 2020-09-01 23:12:31 +03:00
Kitty Barnett d042e085f2 Merge branch 'lindenlab/release' into viewer/build 2020-08-29 15:09:17 +02:00
Andrey Lihatskiy a9885029cf Merge branch 'master' into DRTVWR-507-maint 2020-08-18 19:11:34 +03:00
Kitty Barnett e97981e2de Merge branch 'lindenlab/release' into viewer/build 2020-08-14 21:00:50 +02:00
Andrey Lihatskiy f29ac6757c Merge branch 'master' into DRTVWR-507-maint 2020-08-11 01:35:04 +03:00
Andrey Lihatskiy 9406b757a3 Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
# Conflicts:
#	indra/cmake/DirectX.cmake
#	indra/newview/llviewerparcelmedia.cpp
#	indra/newview/viewer_manifest.py
2020-08-11 01:34:13 +03:00
Andrey Kleshchev 6abf2ca503 SL-13744 Updated bugsplat
Due to some known crashes inside bugsplat and deprecated mac support
2020-08-08 00:05:27 +03:00
Andrey Kleshchev cf83b9f890 SL-13393 Update fmodstudio to 2.00.11 2020-08-07 16:08:52 +03:00
Andrey Kleshchev 40b5babccd updated dullahan links (merge from DRTVWR-476) 2020-08-03 21:05:00 +03:00
Andrey Lihatskiy af7ff3d99f Updated LLCA to codeticket build 546021 2020-08-03 13:42:08 +03:00
Andrey Kleshchev a2b5f44b35 Merge branch 'DRTVWR-476' into DRTVWR-501-maint 2020-07-29 21:49:03 +03:00
Andrey Kleshchev 77f5a06a1e SL-13688 Reverted viewer-manager to pre-tools build 2020-07-27 20:33:52 +03:00
Kitty Barnett 9d36022d62 Add support for Catznip's fork of autobuild 2020-07-25 18:23:18 +02:00
Andrey Lihatskiy 1af3dfc0b3 SL-13642 Updated nghttp2, curl, googlemock, colladadom and boost
Updated nghttp2 to codeticket version 545354
Updated boost to codeticket version 545361
Updated colladadom to codeticket version 545362
Updated googlemock to codeticket version 545363
Updated curl to codeticket version 545369
2020-07-22 10:45:00 +03:00
Kitty Barnett 1c002e7c22 Pass address size to CMake via the platform parameter (see corresponding change in our autobuild) 2020-07-21 23:38:44 +02:00
Kitty Barnett d11fee37b3 Merge branch 'lindenlab/release' into viewer/build 2020-07-21 23:34:11 +02:00
Andrey Lihatskiy f77a30f740 Merge branch 'master' into DRTVWR-507-maint
# Conflicts:
#	autobuild.xml
2020-07-21 11:30:48 +03:00
Andrey Lihatskiy 7bbf3f5f7f Merge branch 'master' into DRTVWR-501-maint
# Conflicts:
#	autobuild.xml
#	indra/newview/llimprocessing.cpp
2020-07-20 22:24:10 +03:00
Andrey Kleshchev 383352c61c SL-13567 Users should have separate CEF contexts 2020-07-17 19:00:58 +03:00
Andrey Lihatskiy 4ac0ab2af3 Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint 2020-07-06 21:48:11 +03:00
Andrey Lihatskiy 2a70664c0d Updated llca to build 544371 2020-07-02 02:54:43 +03:00
Kitty Barnett cb4b95b87b Merge branch 'lindenlab/release' into viewer/build 2020-06-27 11:11:00 +02:00
Nat Goodspeed e83613157b DRTVWR-476: Update to dullahan build 544091 2020-06-24 12:03:28 -04:00
Nat Goodspeed b594b05b0a DRTVWR-476: Update to dullahan build 544081 2020-06-24 09:16:00 -04:00
Nat Goodspeed 80ef11de71 DRTVWR-476: Update to dullahan build 544068 2020-06-23 22:06:21 -04:00
Nat Goodspeed 77cf4588df DRTVWR-476: Merge branch 'master' of lindenlab/viewer into d476
following release of D512.
2020-06-23 22:03:43 -04:00
Andrey Lihatskiy b8127f80c7 Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
# Conflicts:
#	indra/llcommon/llkeybind.cpp
#	indra/llcommon/llkeybind.h
2020-06-24 00:08:35 +03:00
Andrey Lihatskiy 05f3287512 Merge branch 'master' into DRTVWR-501-maint 2020-06-23 23:58:52 +03:00
Kitty Barnett 1bc3d1a186 Merge branch 'lindenlab/release' into viewer/build 2020-06-09 15:33:40 +02:00
Callum Prentice b532f6316b Pull in new version of Dullahan that has a (trivial) fix for SL-13139 chat field on Youtube live is empty. 2020-06-02 13:59:45 -07:00
Andrey Lihatskiy 363e9c949b Merge branch 'master' into DRTVWR-503-maint
# Conflicts:
#	indra/newview/CMakeLists.txt
#	indra/newview/viewer_manifest.py
2020-06-02 23:15:38 +03:00
Callum Prentice d4a38abdf5 Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-512 2020-06-02 13:13:53 -07:00
Nat Goodspeed 50a8c2e41a DRTVWR-476: Merge branch 'master' of bitbucket.org:lindenlab/viewer into d476. 2020-06-02 16:05:56 -04:00
Andrey Lihatskiy 2171d7fbd9 Merge branch 'master' into DRTVWR-501-maint 2020-06-02 23:03:25 +03:00
Callum Prentice 839e7acbc8 Pull in a new version of Dullahan that was built using the first version of CEF built entirely in TeamCity on all platform 2020-05-22 08:18:18 -07:00
Nat Goodspeed 294fb30a3c DRTVWR-476: Update to bugsplat build 542667 2020-05-21 13:45:53 -04:00
Nicky Dasmijn 68bfa4538f Add entries for llphysicsextensions_tpv to autobuild.xml 2020-05-20 10:46:56 -04:00
Nat Goodspeed dbfbe5419c DRTVWR-476: Update to llphysicsextensions_stub build 542456 2020-05-19 08:41:35 -04:00
Callum Prentice d7f254bc13 Pull in new (Windows 64) Dullahan that was built from CEF in TeamCity 2020-05-15 18:05:49 -07: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