6c029e4858
DRTVWR-533 Updated LLCA to CT build 567162
2022-01-11 02:30:30 +02:00
469ce7f7f6
Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JK
...
# Conflicts:
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llkeyconflict.cpp
2022-01-10 23:51:52 +02:00
9ee93d36ba
SL-13297 - Update autobuild.xml for new 3p-slvoice dependency following commit message changes there.
2022-01-06 15:50:25 -08:00
9e30beb534
SL-13297 - bad copypasta
2022-01-06 15:44:48 -08:00
183261bc64
SL-13297 - Use new teamcity slvoice.
2022-01-06 15:44:30 -08:00
970b6661cd
Merge branch 'master' into DRTVWR-543-maint
2021-12-26 14:01:17 +02:00
747dbb7da2
Merge branch 'master' into DRTVWR-540-maint
2021-12-26 14:01:06 +02:00
83b4ea59fc
Merge branch 'SL-15742' into DRTVWR-527-maint
2021-12-16 00:58:44 +02:00
cf35d27dfb
DRTVWR-546 merge up to 6.5.2
2021-12-15 14:37:18 -07:00
edb6293528
Merge branch 'master' into DRTVWR-530-maint
2021-12-15 21:50:40 +02:00
2800905ac3
Merge branch master (DRTVWR-552) into DRTVWR-542-meshopt
...
+resolved viewer-manager's inherited conflict
2021-12-15 21:36:58 +02:00
aa309c2eef
updated viewer-manager after merge
2021-12-15 21:23:03 +02:00
7c1cd47772
Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maint
...
# Conflicts:
# indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback
# indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
2021-12-15 21:16:47 +02:00
0b95b9d008
Merge branch 'master' into SL-15742
2021-12-11 10:29:37 -08:00
f729cfc33f
SL-15742: Convert build scripts to Python 3
...
This changeset makes it possible to build the Second Life viewer using
Python 3. It is designed to be used with an equivalent Autobuild branch
so that a developer can compile without needing Python 2 on their
machine.
Breaking change: Python 2 support ending
Rather than supporting two versions of Python, including one that was
discontinued at the beginning of the year, this branch focuses on
pouring future effort into Python 3 only. As a result, scripts do not
need to be backwards compatible. This means that build environments,
be they on personal computers and on build agents, need to have a
compatible interpreter.
Notes
- SLVersionChecker will still use Python 2 on macOS
- Fixed the message template url used by template_verifier.py
2021-12-10 14:42:49 -08:00
850767eb21
SL-16396 Updater fails with "takes exactly 3 arguments" error
2021-11-29 21:55:45 +02:00
27e4e245d9
Merge branch 'DRTVWR-542-meshopt' into DRTVWR-546
2021-11-29 20:33:13 +02:00
98b416ff5c
SL-16396 Updater fails with "takes exactly 3 arguments" error
2021-11-23 22:56:05 +02:00
49dd88e86c
Merge branch 'master' into DRTVWR-540-maint
...
# Conflicts:
# indra/newview/llfloatereditextdaycycle.cpp
# indra/newview/llviewerinput.cpp
2021-11-19 04:45:15 +02:00
9a1af101cd
Merge branch 'master' into DRTVWR-543-maint
...
# Conflicts:
# indra/newview/llagentwearables.cpp
# indra/newview/llvoicevivox.cpp
2021-11-19 04:38:19 +02:00
472509dff4
SL-16235 Update fmod to 2.02.03
2021-11-18 20:35:42 +02:00
353329c2c2
DRTVWR-546 merge in master v6.5.1
2021-11-16 11:44:55 -07:00
5ccdcf51a3
Merge branch master (DRTVWR-545) into DRTVWR-542-meshopt
2021-11-16 02:22:54 +02:00
0505c6ebbb
Merge branch 'master' into DRTVWR-534
...
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
2021-11-16 01:21:55 +02:00
30c381406c
Merge branch 'master' into DRTVWR-530-maint
...
# Conflicts:
# doc/contributions.txt
2021-11-16 01:09:11 +02:00
5534781acf
SL-15333 Crash in glh_init_extensions
2021-11-12 17:21:50 +02:00
33f52ee51d
SL-14403 Removed glod
2021-11-10 17:48:55 +02:00
a37a36c408
SL-16299 Updated dullahan to CT build 565428; entitlements cleanup
2021-11-04 01:10:46 +02:00
98d96f0dea
Manually resolving conflicts after merge with DRTVWR-520
...
This reverts commit 0a745b4788
2021-11-02 22:55:55 +02:00
5c5a1973a1
Merge remote-tracking branch 'origin/master' into DRTVWR-540-maint
...
# Conflicts:
# autobuild.xml
# indra/newview/CMakeLists.txt
# indra/newview/installers/darwin/apple-notarize.sh
# indra/newview/llappviewermacosx.cpp
# indra/newview/llappviewerwin32.h
# indra/newview/viewer_manifest.py
# indra/win_crash_logger/llcrashloggerwindows.cpp
2021-11-02 22:42:32 +02:00
6921edcc39
SL-16293 Updated vlc to CT build 565299
2021-11-01 21:23:12 +02:00
2e760ae7dd
SL-16235 Update fmod to 2.02.03
2021-10-27 19:18:54 +03:00
12d68c3f6c
Merge branch 'master' into DRTVWR-543-maint
...
# Conflicts:
# autobuild.xml
# indra/CMakeLists.txt
# indra/llcommon/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llappviewerwin32.h
2021-10-22 16:29:58 +03:00
bb92dae312
DRTVWR-530 Updated uriparser to codeticket build 564957
2021-10-22 15:32:06 +03:00
07aa342bc4
Merge branch 'master' into DRTVWR-530-maint
...
# Conflicts:
# autobuild.xml
2021-10-22 15:27:15 +03:00
725fc6fa85
Fix for SL-16208 Introduce a canonical_repo tag into the autobuild.xml file for new 3p repos - no new code introduced in this pass
2021-10-19 15:23:08 -07:00
6b2e40157b
Merge branch 'master' v6.4.24 into DRTVWR-546
2021-10-13 16:41:24 -06:00
20e05a5c11
Merge branch master (DRTVWR-520) into DRTVWR-542-meshopt
2021-10-14 01:01:09 +03:00
8a1bc1b9e2
Merge with head of Master after a new Viewer release
2021-10-13 14:47:06 -07:00
fb170ffe21
Merge branch 'master' into DRTVWR-545-maint-mix
2021-10-14 00:35:08 +03:00
adcd08fbf4
Revert "Merge branch 'c++17' into DRTVWR-522-maint"
...
This reverts commit 203ea3a70a8e3f077886
2021-09-28 19:22:18 +03:00
717fe2cc5c
DRTVWR-520 Updated dullahan to codeticket build 563968
2021-09-23 10:57:37 +03:00
4a411d9896
Revert "DRTVWR-520 Updated dullahan to codeticket build 562751"
...
This reverts commit adb724564d
2021-09-21 19:31:04 +03:00
b7dc69f147
SL-14541 Packages with fixed license label
2021-09-11 17:08:00 +03:00
da29b6be10
SL-14541 Package with fixed minizip-ng version recognition
2021-09-09 14:46:01 +03:00
5af8f15a05
SL-14541 Replace zlib with zlib-ng
2021-09-08 23:18:07 +03:00
13ff2cba53
SL-15709: Add Darwin support
2021-09-03 17:53:44 -07:00
2e88a32665
SL-15595 update viewer autobuild to import tracy lib
2021-09-03 17:53:43 -07:00
b18f328c08
Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mix
...
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llmachineid.cpp
2021-09-03 00:18:26 +03:00
ecf819b38b
DRTVWR-521 Updated llca to codeticket build 563493
2021-09-01 20:48:34 +03:00
a29b1960c6
SL-15900 Update the version of three.js we build against to latest before pv release - I mssed up and commited a merge conflict which of course, broke everything - fixed now
2021-08-30 09:28:04 -07:00
d3280953df
SL-15900 Update the version of three.js we build against to latest before pv release - fixed
2021-08-27 16:41:52 -07:00
203ea3a70a
Merge branch 'c++17' into DRTVWR-522-maint
2021-08-27 19:24:05 +03:00
0c89e67eb5
DRTVWR-534: Batch of modifications to 360 capture project after moving from internal repo to public one.
2021-08-20 08:28:48 -07:00
76da77d2a9
SL-15588 Updated llphysicsextensions_tpv to codeticket version 562599
2021-08-14 00:12:24 +03:00
adb724564d
DRTVWR-520 Updated dullahan to codeticket build 562751
2021-08-12 23:13:18 +03:00
97f09de4fc
Merge branch 'master' into DRTVWR-520-apple-notarization
...
# Conflicts:
# autobuild.xml
# build.sh
# indra/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llappviewermacosx.cpp
# indra/newview/llappviewerwin32.h
# indra/newview/viewer_manifest.py
# indra/win_crash_logger/llcrashloggerwindows.cpp
2021-08-12 23:13:12 +03:00
c80ad209b3
Merge master (DRTVWR-531) into DRTVWR-542-meshopt
2021-08-10 16:49:39 +03:00
9ac1a63a41
Merge branch 'master' into DRTVWR-530-maint
2021-08-10 06:43:59 +03:00
3f501ec2d0
Merge branch 'master' into DRTVWR-522-maint
2021-08-10 06:43:37 +03:00
12836d5f91
Merge remote-tracking branch 'origin/master' into DRTVWR-521-maint
2021-08-10 06:27:44 +03:00
497d4a5374
SL-15695 Updater installs 64 bit viewer instead of 32 bit on specific intel graphics device
2021-07-27 21:38:02 +03:00
a242edc99d
Merge with Master after Viewer Release (also fixed some glaring automerge screw ups)
2021-07-19 17:43:19 -07:00
b8d846f0ed
Merge master (DRTVWR-516) into DRTVWR-542-meshopt
2021-07-20 00:58:09 +03:00
3a476a8296
Merge branch 'master' into DRTVWR-530-maint
2021-07-19 22:22:42 +03:00
4372913f59
DRTVWR-542 updated 3p-meshoptimizer
...
Improved version detection 3p-meshoptimizer side
2021-07-12 22:24:27 +03:00
97c954dd84
SL-15522 Initial addition of meshoptimizer
2021-07-07 00:42:31 +03:00
38765be8b0
Fix for: SL-15433 Update version of CEF used in the Viewer to 91.0.4472.114
2021-06-21 19:18:58 -07:00
45135a7c58
Fix for: SL-15422 Update version of CEF used in the Viewer to 91.0.4472.101. Also includes a tweak to viewer_manifest.py to handle some CEF file changes"
2021-06-17 12:42:58 -07:00
d14ebd1f52
Updated llca to codeticket build 560271
2021-06-01 21:31:30 +03:00
b91561e982
SL-15211 Update OpenSSL library
2021-05-27 12:56:35 +03:00
c308c1cf59
Pull in updated Dullahan and use it for for: Fix SL-14888 Media on a Prim should not show JS (about to unload) popups
2021-05-18 08:45:57 -07:00
a442f8b451
Revert "Merge branch 'DRTVWR-531' into DRTVWR-516-maint"
...
This reverts commit 07456abe928a33636e8f
2021-05-13 20:29:01 +03:00
b4817ef394
SL-15258: Update to colladadom without auto_ptr
2021-05-13 12:46:10 -04:00
07456abe92
Merge branch 'DRTVWR-531' into DRTVWR-516-maint
2021-05-11 21:27:58 +03:00
ed78b2b938
SL-15234 Fix for linux build of 3p-uriparser by NickyD
...
Linux specific contibution. Should not affect win and darwin. Doesn't include linux build, just an update to ensure changes gets pulled into uriparser's master when viewer gets promoted and to make sure nothing complains about issues with 'head revision'.
2021-05-07 20:57:43 +03:00
933b98880e
DRTVWR-520 Updated uriparser to codeticket build 559132
2021-05-01 02:14:54 +03:00
789be6b933
Merge branch 'master' into DRTVWR-520-apple-notarization
2021-04-30 03:05:19 +03:00
e41412edda
Merge remote-tracking branch 'origin/master' into DRTVWR-531
2021-04-29 13:41:02 -07:00
3f31901640
Merge master (DRTVWR-515) into DRTVWR-516-maint
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/llcommon/llcoros.cpp
# indra/llmessage/llcoproceduremanager.cpp
# indra/newview/llfloaterfixedenvironment.cpp
# indra/newview/llfloaterimsessiontab.cpp
2021-04-29 21:00:25 +03:00
3623e6eb8a
DRTVWR-520 Updated dullahan to codeticket build 558653
2021-04-22 09:37:50 +03:00
9080c818e0
DRTVWR-520 Updated apr_suite to codeticket build 558565
2021-04-21 07:04:53 +03:00
5d4ca2edfb
DRTVWR-520 Updated slvoice to codeticket build 558436
2021-04-21 07:01:01 +03:00
2de92430ef
Revert "SL-15141 Update CURL to 7.76.1" due to OPS-4251
...
This reverts commit 45b5ac72b2
2021-04-20 19:42:39 +03:00
45b5ac72b2
SL-15141 Update CURL to 7.76.1
...
CURLE_SSL_CACERT is now identical to CURLE_SSL_PEER_CERTIFICATE
2021-04-20 02:12:16 +03:00
75f26d123d
Update to Chromium version 89.0.4389.114
2021-04-13 09:36:50 -07:00
2dbd5c5762
Pull in macOS version of CEF 89
2021-04-01 14:38:19 -07:00
930b8ed36e
Merge with ti of master after Viewer release
2021-04-01 14:35:28 -07:00
9fe758e8bc
Merge branch 'master' into DRTVWR-516-maint
2021-04-01 20:45:16 +03:00
6240168f24
Merge branch 'master' into DRTVWR-515-maint
2021-04-01 20:45:06 +03:00
b6883636ff
Updated llca to codeticket build 557744
2021-04-01 12:42:59 +03:00
6b73a8331f
SL-14541 removed breakpad, win_crash_logger, updated zlib
2021-03-17 00:19:38 +02:00
3b7771756b
Revert "Updated llca to codeticket build 556422"
...
This reverts commit 4add069cae
2021-03-03 21:16:23 +02:00
b1add74c31
Pull in the newest Dullahan 1.10.x with CEF/Chromium 89.x
2021-03-03 10:09:27 -08:00
4add069cae
Updated llca to codeticket build 556422
2021-03-01 23:49:13 +02:00
2aea7cfc25
Pull in new version of Dullahan with support for setting the host process path, tweak viewer manifest so it copies the SwiftShader folder (required but may be a Chromium bug) and improve background color matching
2021-02-24 15:20:39 -08:00
bc8bf1cb54
SL-13788 Detecting Intel HD 400 as just Intel HD
...
CPU based detection in case Intel HD Graphics got detected
2021-02-24 14:41:21 +02:00
5f4f0d2936
DRTVWR-520 Updated colladadom to codeticket build 556305
2021-02-23 23:59:11 +02:00
a0335671d5
DRTVWR-520 Updated googlemock to codeticket build 556304
2021-02-23 23:34:25 +02:00
c2660c152f
DRTVWR-520 Updated boost to codeticket build 556301
2021-02-23 23:07:54 +02:00
329d490036
First set of changes to make Dullahan build with CEF v88
2021-02-22 16:38:05 -08:00
31bb38a6f3
SL-13788 Some Intel gpus are recognized as just Intel HD Graphics
2021-02-18 18:11:20 +02:00
e320a463ac
DRTVWR-520 Updated dullahan to codeticket build 555904
2021-02-10 22:02:59 +02:00
fc166dabc0
DRTVWR-520 Updated fmod to codeticket build 555883
2021-02-10 15:59:04 +02:00
fd8eab7e61
DRTVWR-520 Updated fmod to codeticket build 555876
2021-02-10 13:14:28 +02:00
2da7bc83b5
Updated LLCA to codeticket build 555615
2021-02-02 19:08:12 +02:00
44b6459dfa
Merge branch 'master' into DRTVWR-514-keymappings
...
# Conflicts:
# indra/llui/llscrolllistctrl.cpp
2021-02-01 23:33:41 +02:00
7396a528c0
Temporary revert "Updated LLCA to codeticket build 555537"
...
This reverts commit eac0f1857c
2021-02-01 23:03:56 +02:00
609a26b59a
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer/src/master into DRTVWR-515-maint
...
# Conflicts:
# autobuild.xml (llca)
# indra/llwindow/llwindow.h (SL-13507 vs SL-5894)
# indra/newview/llscenemonitor.cpp (SL-14422)
# indra/newview/llvovolume.cpp (SL-12069)
2021-02-01 22:28:15 +02:00
d07f52da62
Merge branch 'master' into DRTVWR-520-apple-notarization
2021-02-01 22:11:44 +02:00
eac0f1857c
Updated LLCA to codeticket build 555537
2021-02-01 09:22:53 +02:00
1fd44923b5
DRTVWR-520 Updated dullahan to codeticket build 555532
2021-02-01 04:00:41 +02:00
cbee72276d
DRTVWR-520 Updated xmlrpc-epi to codeticket build 555529
2021-02-01 03:27:52 +02:00
63d9d378f4
DRTVWR-520 Updated 3p-libs to use signed versions
...
Updated apr-suite to codeticket build 555520
Updated curl to codeticket build 555526
Updated glod to codeticket build 555522
Updated expat to codeticket build 555519
Updated libhunspell to codeticket build 555528
Updated libndofdev to codeticket build 555523
Updated nghttp2 to codeticket build 555524
2021-02-01 03:14:11 +02:00
0e4faf7d9c
SL-12198 Pull in updated version checker
2021-01-26 01:03:00 +02:00
2f00eef6b4
SL-14597 Fixed mac library only including symlink
2021-01-16 13:16:12 +02:00
3d525fbf18
SL-14597 Pulled in updated uriparser
...
Due to crash inside uriparser's code
2021-01-16 01:06:16 +02:00
e7a98c7dc0
Updated LLCA to codeticket build 553112
2020-12-02 04:03:06 +02:00
10fa792e11
SL-14393 Updater update
...
Switch Intel HD4000 and HD2500 off of forced 32-bit
2020-11-25 01:37:10 +02:00
fb17b94f0f
SL-14012 Crashes from Win10 are sent with uninformative callstacks #2
2020-11-19 20:46:52 +02:00
273fbb3238
SL-14201 Fix Altgr in CEF
...
Moved from D521
2020-11-16 18:48:38 +02:00
0bba892bb0
Merge branch 'master' into DRTVWR-515-maint
...
# Conflicts:
# indra/newview/llfloatereditextdaycycle.cpp
# indra/newview/llfloaterfixedenvironment.cpp
2020-11-13 18:22:43 +02:00
b9bcfad195
Merge branch 'master' into DRTVWR-520-apple-notarization
2020-11-11 22:45:54 +02:00
0303dd8179
Merge branch 'master' into DRTVWR-513-maint
...
# Conflicts:
# autobuild.xml
# indra/llui/llfolderviewmodel.h
# indra/newview/lltexturecache.cpp
# indra/newview/llviewermenu.h
# indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
2020-11-11 22:14:24 +02:00
dfc406f0ff
SL-13283 Update favicons with new logo
2020-11-06 19:51:36 +02:00
5b023c8ae6
SL-13740 Updated updater
2020-11-06 18:19:21 +02:00
597d777c9f
Updated LLCA to codeticket build 551526
2020-11-02 17:54:41 +02:00
4b2a611596
Updated LLCA to codeticket build 550026
2020-10-21 16:20:47 +03:00
f08421e651
SL-14012 Crashes from Win10 are sent with uninformative callstacks
...
Simplify name generation according to slack discussion, also helps bugsplat with matching files
2020-10-06 21:59:39 +03:00
8803157a21
SL-13953 Builds should fail if symbols upload failed
2020-10-05 20:56:26 +03:00
5cae545e09
Updated LLCA to codeticket build 549857
2020-10-01 18:34:58 +03:00
e10051ca08
SL-14044 Updated VLC to codeticket version 549888
2020-10-01 07:23:36 +03:00
108550e68e
SL-13873 update copyright date to 2020
2020-09-25 16:29:05 +03:00
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
05b98ec861
Updated apr_suite to codeticket build 548882
2020-09-11 23:57:31 +03:00
128f0833cf
Updated LLCA to codeticket build 548269
2020-09-03 20:03:29 +03:00
f73eb32b37
Updated LLCA to codeticket build 548269
2020-09-01 23:12:31 +03:00
a9885029cf
Merge branch 'master' into DRTVWR-507-maint
2020-08-18 19:11:34 +03:00
f29ac6757c
Merge branch 'master' into DRTVWR-507-maint
2020-08-11 01:35:04 +03:00
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
6abf2ca503
SL-13744 Updated bugsplat
...
Due to some known crashes inside bugsplat and deprecated mac support
2020-08-08 00:05:27 +03:00
cf83b9f890
SL-13393 Update fmodstudio to 2.00.11
2020-08-07 16:08:52 +03:00
40b5babccd
updated dullahan links (merge from DRTVWR-476)
2020-08-03 21:05:00 +03:00
af7ff3d99f
Updated LLCA to codeticket build 546021
2020-08-03 13:42:08 +03:00
a2b5f44b35
Merge branch 'DRTVWR-476' into DRTVWR-501-maint
2020-07-29 21:49:03 +03:00
77f5a06a1e
SL-13688 Reverted viewer-manager to pre-tools build
2020-07-27 20:33:52 +03:00
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
f77a30f740
Merge branch 'master' into DRTVWR-507-maint
...
# Conflicts:
# autobuild.xml
2020-07-21 11:30:48 +03:00
7bbf3f5f7f
Merge branch 'master' into DRTVWR-501-maint
...
# Conflicts:
# autobuild.xml
# indra/newview/llimprocessing.cpp
2020-07-20 22:24:10 +03:00
383352c61c
SL-13567 Users should have separate CEF contexts
2020-07-17 19:00:58 +03:00
4ac0ab2af3
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
2020-07-06 21:48:11 +03:00
2a70664c0d
Updated llca to build 544371
2020-07-02 02:54:43 +03:00
e83613157b
DRTVWR-476: Update to dullahan build 544091
2020-06-24 12:03:28 -04:00
b594b05b0a
DRTVWR-476: Update to dullahan build 544081
2020-06-24 09:16:00 -04:00
80ef11de71
DRTVWR-476: Update to dullahan build 544068
2020-06-23 22:06:21 -04:00
77cf4588df
DRTVWR-476: Merge branch 'master' of lindenlab/viewer into d476
...
following release of D512.
2020-06-23 22:03:43 -04:00
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
05f3287512
Merge branch 'master' into DRTVWR-501-maint
2020-06-23 23:58:52 +03:00
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
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
d4a38abdf5
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-512
2020-06-02 13:13:53 -07:00
50a8c2e41a
DRTVWR-476: Merge branch 'master' of bitbucket.org:lindenlab/viewer into d476.
2020-06-02 16:05:56 -04:00
2171d7fbd9
Merge branch 'master' into DRTVWR-501-maint
2020-06-02 23:03:25 +03:00
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
294fb30a3c
DRTVWR-476: Update to bugsplat build 542667
2020-05-21 13:45:53 -04:00
68bfa4538f
Add entries for llphysicsextensions_tpv to autobuild.xml
2020-05-20 10:46:56 -04:00
dbfbe5419c
DRTVWR-476: Update to llphysicsextensions_stub build 542456
2020-05-19 08:41:35 -04:00
d7f254bc13
Pull in new (Windows 64) Dullahan that was built from CEF in TeamCity
2020-05-15 18:05:49 -07:00
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
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
53da10525e
SL-11445 pulled in fresh fmod studio package
2020-05-05 20:24:17 +03:00
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
ec9b989863
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
...
# 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-05 00:37:16 +03:00
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
b9fcd3dbf9
Pull in the Dullahan package from the DRTVWR-512 branch of the canonical Dullahan repository
2020-04-28 15:37:27 -07:00
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
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
4768d092f6
DRTVWR-476: Update to llca build 541101
2020-04-28 10:19:24 -04:00
347c53855b
SL-12607 Added more icons and draw methods to draw them
2020-04-13 22:41:55 +03:00
320787f405
DRTVWR-476: Update zlib, freetype, libpng, boost, openssl, libxml2, googlemock, google_breakpad, curl, colladadom
...
Update zlib to codeticket version 538988.
Update freetype to codeticket version 539865.
Update libpng to codeticket version 539868.
Update boost to codeticket version 539869.
Update openssl to codeticket version 539874.
Update libxml2 to codeticket version 539866.
Update googlemock to codeticket version 539876.
Update google_breakpad to codeticket version 539880.
Update curl to codeticket version 539883.
Update colladadom to codeticket version 539922.
2020-04-08 20:20:32 -04:00
9db2439240
DRTVWR-476: Update openssl, zlib, freetype, libxml2, libpng, boost, google_breakpad, curl, googlemock, colladadom
...
Update openssl to codeticket version 539835.
Update zlib to codeticket version 538988.
Update freetype to codeticket version 539828.
Update libxml2 to codeticket version 539829.
Update libpng to codeticket version 539830.
Update boost to codeticket version 539833.
Update google_breakpad to codeticket version 539846.
Update curl to codeticket version 539847.
Update googlemock to codeticket version 539769.
Update colladadom to codeticket version 539768.
2020-04-08 10:31:16 -04:00
1bf3448fd4
DRTVWR-476: Update boost, colladadom, googlemock
...
Update boost to codeticket version 539746.
Update colladadom to codeticket version 539768.
Update googlemock to codeticket version 539769.
2020-04-07 14:50:24 -04:00
c4d1cc9e9c
DRTVWR-476: Update to slvoice build 539691
2020-04-03 16:44:05 -04:00
de696d0213
SL-12893 argparse wasn't reading value right
2020-04-02 22:25:45 +03:00
b4eb46a7ec
SL-12893 Pulled in VVM fix
2020-04-02 19:40:17 +03:00
fba4fcabc4
Pulled in VVM fixes
2020-03-31 20:53:50 +03:00
8fb39231db
DRTVWR-476: Update tut, llca, pcre, bugsplat, zlib, expat, nvapi, glext, vlc-bin, viewer-manager, uriparser, slvoice, openjpeg, ogg_vorbis, llphysicsextensions_source, libndofdev, libhunspell, jsoncpp, jpeglib, glod, glh_linear, fmodex, dictionaries, nghttp2, libxml2, openssl, libpng, freetype, xmlrpc-epi, apr_suite, dullahan, google_breakpad, curl, kdu, havok-source, boost, colladadom, googlemock
...
Update tut to codeticket version 539059.
Update llca to codeticket version 539061.
Update pcre to codeticket version 538986.
Update bugsplat to codeticket version 538987.
Update zlib to codeticket version 538988.
Update expat to codeticket version 538990.
Update nvapi to codeticket version 539058.
Update glext to codeticket version 538965.
Update vlc-bin to codeticket version 538966.
Update viewer-manager to codeticket version 538967.
Update uriparser to codeticket version 538968.
Update slvoice to codeticket version 538969.
Update openjpeg to codeticket version 538970.
Update ogg_vorbis to codeticket version 538971.
Update llphysicsextensions_source to codeticket version 538972.
Update libndofdev to codeticket version 538973.
Update libhunspell to codeticket version 538974.
Update jsoncpp to codeticket version 538976.
Update jpeglib to codeticket version 538977.
Update glod to codeticket version 538980.
Update glh_linear to codeticket version 538981.
Update fmodex to codeticket version 538982.
Update dictionaries to codeticket version 538984.
Update nghttp2 to codeticket version 538985.
Update libxml2 to codeticket version 539066.
Update openssl to codeticket version 539067.
Update libpng to codeticket version 539069.
Update freetype to codeticket version 539071.
Update xmlrpc-epi to codeticket version 539072.
Update apr_suite to codeticket version 539073.
Update dullahan to codeticket version 539088.
Update google_breakpad to codeticket version 539090.
Update curl to codeticket version 539091.
Update kdu to codeticket version 539108.
Update havok-source to codeticket version 539117.
Update boost to codeticket version 539140.
Update colladadom to codeticket version 539147.
Update googlemock to codeticket version 539148.
2020-03-25 19:28:43 -04:00
871c0cfe9d
DRTVWR-476: Update boost, colladadom, googlemock
...
Update boost to codeticket version 533856.
Update colladadom to codeticket version 533872.
Update googlemock to codeticket version 533873.
2020-03-25 19:25:42 -04:00
5689b311c7
DRTVWR-476: Update viewer-manager to codeticket version 533794.
2020-03-25 19:24:25 -04:00
e1e9247a31
DRTVWR-476: Update boost, colladadom, googlemock
...
Update boost to codeticket version 533684.
Update colladadom to codeticket version 533705.
Update googlemock to codeticket version 533706.
2020-03-25 19:24:25 -04:00
95cf6dddae
DRTVWR-476,SL-11215,SL-11216: Update to viewer-manager build 533067
2020-03-25 19:21:16 -04:00
70a63ca331
DRTVWR-476, SL-12205: Update to glod built with VS 2017 runtime libs.
2020-03-25 19:06:12 -04:00
698922e0ed
DRTVWR-476: Update to slvoice build 532334
2020-03-25 19:06:12 -04:00
bf3c04ac38
DRTVWR-476: Update libndofdev to codeticket version 532324.
2020-03-25 19:05:17 -04:00
aaae44788d
DRTVWR-476: Update to bugsplat build 532004
2020-03-25 18:59:10 -04:00
0cde6669f0
DRTVWR-476: Update to viewer-manager build 531762
2020-03-25 18:52:10 -04:00
54bc5ee9e1
DRTVWR-476: Update to viewer-manager build 531568
2020-03-25 18:47:13 -04:00
eb75b35882
DRTVWR-476: Update to openjpeg build 531548
2020-03-25 18:47:13 -04:00
6a3b0363d1
DRTVWR-476: Update vlc-bin, jsoncpp, pcre, libndofdev, libhunspell, bugsplat, fmodex, llca, jpeglib, libxml2, slvoice, glod, dullahan, glext, kdu, uriparser, glh_linear, tut, nghttp2, dictionaries, zlib, llphysicsextensions_source, openjpeg, nvapi, expat, viewer-manager, google_breakpad, libpng, ogg_vorbis, openssl, xmlrpc-epi, apr_suite, freetype, boost, colladadom, googlemock, curl, havok-source
...
Update vlc-bin to codeticket version 531366.
Update jsoncpp to codeticket version 531360.
Update pcre to codeticket version 531373.
Update libndofdev to codeticket version 531359.
Update libhunspell to codeticket version 531369.
Update bugsplat to codeticket version 531352.
Update fmodex to codeticket version 531266.
Update llca to codeticket version 531253.
Update jpeglib to codeticket version 531361.
Update libxml2 to codeticket version 531380.
Update slvoice to codeticket version 531358.
Update glod to codeticket version 531370.
Update dullahan to codeticket version 531387.
Update glext to codeticket version 531247.
Update kdu to codeticket version 531363.
Update uriparser to codeticket version 531367.
Update glh_linear to codeticket version 531260.
Update tut to codeticket version 531246.
Update nghttp2 to codeticket version 531364.
Update dictionaries to codeticket version 531288.
Update zlib to codeticket version 531372.
Update llphysicsextensions_source to codeticket version 531362.
Update openjpeg to codeticket version 531368.
Update nvapi to codeticket version 531376.
Update expat to codeticket version 531365.
Update viewer-manager to codeticket version 531239.
Update google_breakpad to codeticket version 531388.
Update libpng to codeticket version 531386.
Update ogg_vorbis to codeticket version 531357.
Update openssl to codeticket version 531379.
Update xmlrpc-epi to codeticket version 531374.
Update apr_suite to codeticket version 531375.
Update freetype to codeticket version 531385.
Update boost to codeticket version 531381.
Update colladadom to codeticket version 531391.
Update googlemock to codeticket version 531390.
Update curl to codeticket version 531389.
Update havok-source to codeticket version 531509.
2020-03-25 18:47:13 -04:00
e33a747dd9
DRTVWR-476: Update to havok-source build 531405
2020-03-25 18:44:05 -04:00
00e2e949bb
DRTVWR-476: Update to libndofdev build 530327
2020-03-25 18:44:04 -04:00
16453005bb
[DRTVWR-476] - update cef, fix merge
2020-03-25 18:40:45 -04:00
e36eaa685c
[DRTVWR-476] - update googlemock,boost,colladom
2020-03-25 18:40:44 -04:00
00437298d0
[DRTVWR-476] - update breakpad
2020-03-25 18:39:21 -04:00
b09770946a
[DRTVWR-476] - disable dbghelp.h warnings
2020-03-25 18:39:20 -04:00
6e69cb4852
[DRTVWR-476] - update libpng, libndo, xmlrpc
2020-03-25 18:39:20 -04:00
b98c392864
[DRTVWR-476] - update kdu
2020-03-25 18:39:20 -04:00
554e12ef15
[DRTVWR-476] - update apr and kdu
2020-03-25 18:39:20 -04:00
fc09af763c
[DRTVWR-476] - update openjpeg
2020-03-25 18:39:20 -04:00
cb6b06d7c8
SL-793: Update to boost build 509640
2020-03-25 16:47:24 -04:00
88dbeba143
SL-793: Update to boost build 509450
2020-03-25 16:37:45 -04:00
8124870e43
SL-793
...
Update boost to codeticket version 509640.
Update colladadom to codeticket version 509683.
Update googlemock to codeticket version 509686.
2020-03-25 16:36:32 -04:00
8ff5c378f7
SL-793
...
Update boost to codeticket version 509519.
Update colladadom to codeticket version 509540.
Update googlemock to codeticket version 509541.
2020-03-25 16:35:36 -04:00
5ca997856f
SL-793
...
Update colladadom to codeticket version 509467.
Update googlemock to codeticket version 509463.
Update boost to codeticket version 509450.
2020-03-25 16:34:35 -04:00
7ef0d43b53
SL-793: Update viewer to Boost 1.65.1 build 508584 and dependencies.
2020-03-25 16:29:36 -04:00
9bc3da0ed6
[DRTVWR-476] - update colladodom
2020-03-25 16:27:36 -04:00
9c44e39f6a
[DRTVWR-476] - updated googlemock
2020-03-25 16:27:35 -04:00
baa19813c0
[DRTVWR-476] - update boost
2020-03-25 16:27:35 -04:00
5db924ce18
[DRTVWR-476] - update googlemock
2020-03-25 16:27:35 -04:00
ca0cc135f2
[DRTVWR-476] - updated libpng
2020-03-25 16:27:35 -04:00
2f1a48e0ec
[DRTVWR-476] - update autobuild curl package
2020-03-25 16:27:35 -04:00
f0654f696d
[DRTVWR-476] - update autobuild packages
2020-03-25 16:27:35 -04:00
e849dfb9fa
DRTVWR-476: Update Copy3rdPartyLibs.cmake for VS 2017 version.
...
Also, on Windows, put build output into
build-vc$AUTOBUILD_VSVER-$AUTOBUILD_ADDRSIZE instead of hard-coding
build-vc120-$AUTOBUILD_ADDRSIZE.
2020-03-25 16:08:43 -04:00
1846234caa
SL-11216: Update to viewer-manager build 529878
2020-03-25 16:07:47 -04:00
6b203f2ee4
SL-12607 FMOD Logo
2020-03-19 21:39:05 +02:00
b99fcdb30a
SL-12707 Build Fails Without FMOD
...
Also adds correct working directory to RelWithDebInfoOS and enables OpenAl on OS builds for windows
2020-02-14 13:34:07 +02:00
6627d684a2
SL-12654 Remove support for building with fmod ex
2020-02-04 17:12:19 +02:00
192aee0f19
Merged in SL-11445 Upgrade Fmodex to Fmod Studio
2020-01-31 15:05:51 +00:00
c5da1b0863
DRTVWR-496 Changed canonical_repo to lindenlab/viewer
2020-01-28 18:28:07 +02:00
3eb54ae91b
DRTVWR-496 Changed canonical_repo to lindenlab/viewer-dev
2020-01-28 02:31:54 +02:00
d0d2a6e8a4
Merged in lindenlab/viewer-release
2019-10-29 20:02:11 +02:00
80236bb657
merge 6.3.2-release
2019-10-16 09:07:50 -04:00
1cb5ec9023
upgrade SLVoice to 4.10.0000.32327.5fc3fe7c.531581
2019-10-04 11:12:38 -04:00
7e494d402d
experimental 4.10 win64 package
2019-10-01 13:08:55 -04:00
f7d6fa677c
update to SLVoice build 4.9.0002.32137.3410b595.531271
2019-09-27 11:49:39 -04:00
00d7698999
upgrade to SLVoice package after fix for ortp linking
2019-09-25 15:54:40 -04:00
da560ac644
VOICE-80: suppress output to console on Windows
2019-09-20 14:33:57 -04:00
c9bb783331
update to SLVoice version 4.9.0002.32137.3410b595.531025
2019-09-17 14:40:25 -04:00
5d96cf3f71
SL-11917 Updated VVM
2019-09-17 14:55:06 +03:00
2f7b606202
Backed out changeset: 8e228364f324
2019-09-14 05:14:24 +03:00
28640c19e8
Backed out changeset: 4273d752fb17
2019-09-14 05:13:58 +03:00
ddbe9583ff
Backed out changeset: a6398f90389a
2019-09-14 05:13:53 +03:00
a07b64d30e
Backed out changeset: 4a7dac768fae
2019-09-14 05:13:45 +03:00
423a9645e0
Backed out changeset: 20da15768791
2019-09-14 05:13:35 +03:00
a100d62783
Backed out changeset: 8da237b54852
2019-09-14 05:13:27 +03:00
11390ad8ed
Backed out changeset: 122dc88276c7
2019-09-14 05:13:19 +03:00
1b2579eca2
SL-11536 Backed out CEF update (changeset: c246ab81b298)
2019-09-14 02:28:34 +03:00
eccc8f6721
update Mac slvoice build
2019-09-13 09:43:28 -04:00
b74f698caa
handle slvoice executable separately from the vivox libraries, and update mac slvoice package
2019-09-06 11:51:36 -04:00
4cbef35f50
update Vivox for VOICE-56
2019-07-16 18:17:23 -04:00
Andrey Lihatskiy