1536fdd1c3
Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer
2021-08-24 10:47:18 +02:00
de3f5d2ed6
Linux; KDU 8.2
2021-08-23 18:19:37 +02:00
b2569a06e6
Windows; Update KDU to 8.2
2021-08-23 17:55:59 +02: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
c4c25c6853
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-08-10 13:53:07 +02:00
362946572f
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-08-10 12:58:35 +02: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
ca4e15c930
Merge branch 'DRTVWR-531' of https://bitbucket.org/lindenlab/viewer
2021-08-09 14:27:13 +02:00
5776bd5410
Merge branch 'DRTVWR-522-maint' of https://bitbucket.org/lindenlab/viewer
2021-08-09 11:10:17 +02:00
2251bbbce7
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-08-02 09:28:56 +02:00
7c81cd821f
Linux FMOD Studio 2.02.02
2021-08-01 09:01:15 +02:00
81ae59fea5
Update FMOD Studio to 2.02.02 on Windows
2021-07-30 01:44:32 +02: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
9718a38e9a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-07-21 03:07:48 +02: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
347a35540b
Update version meta info as well
2021-07-19 23:23:51 +02:00
8d03072b29
Updated Havok TPV lib
2021-07-19 23:20:14 +02:00
3a476a8296
Merge branch 'master' into DRTVWR-530-maint
2021-07-19 22:22:42 +03:00
238ce718a6
FIRE-31062: Rebuild KDU for macOS to allow running on older versions.
2021-07-15 22:28:06 -05:00
b758c75584
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-07-15 13:30:05 +02:00
8aab2b57dd
Linux/OSX FMOD Studio 2.02.01
2021-07-13 20:15:03 +02:00
006e1ff01d
FMOD Studio 2.02.01 for Windows
2021-07-13 14:13:25 +02: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
826ee26272
Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer
2021-06-08 19:55:43 +02:00
050d28967a
Merge branch 'DRTVWR-520-apple-notarization' of https://bitbucket.org/lindenlab/viewer
2021-06-08 18:57:04 +02:00
76f5e4f40a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-06-08 18:04:42 +02: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
2ea6f51200
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm
2021-05-25 09:11:03 +02: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
fcfaa2d735
Update OpenJPEG to 2.4.0 for Windows
2021-05-16 16:20:19 +02:00
9826ae6967
Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer
2021-05-13 23:26:52 +02: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
cd3b20552c
Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer
2021-05-11 21:09:19 +02: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
d4f1140e60
FMOD Studio 2.01.09 for macOS.
2021-05-05 17:53:13 -05:00
d9183063a8
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-516
2021-05-04 19:37:12 +02:00
76b932e008
Merge branch 'DRTVWR-520-apple-notarization' of https://bitbucket.org/lindenlab/viewer
2021-05-02 01:06:17 +02:00
d250798c6a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-05-02 00:53:38 +02:00
ec2d230323
Linux; Update open_libndofdev
2021-05-01 13:13:12 +02:00
1124ec1cd4
Linux; Updated uriparser
2021-05-01 12:17:34 +02:00
933b98880e
DRTVWR-520 Updated uriparser to codeticket build 559132
2021-05-01 02:14:54 +03:00
94534f4c88
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-04-30 23:25:06 +02: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
0405613511
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-04-24 22:38:49 +02:00
3623e6eb8a
DRTVWR-520 Updated dullahan to codeticket build 558653
2021-04-22 09:37:50 +03:00
ade99f8f6e
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-04-22 07:18:44 +02: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
af2fd21780
Linux; Update fmodstudio to 2.01.09.
2021-04-20 15:31:30 +02: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
e5be0b6ee1
FMOD update to 2.01.09 on Windows
2021-04-19 11:34:41 +02:00
4841acd297
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-04-17 22:44:52 +02:00
c9a9936edd
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-04-16 23:01:15 +02:00
75f26d123d
Update to Chromium version 89.0.4389.114
2021-04-13 09:36:50 -07:00
fd19a25282
KDU 8.1 for macOS.
2021-04-03 10:20:57 -05:00
c890dd2b1e
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-04-02 20:58:03 +02:00
db72dc7d0f
Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer
2021-04-02 19:33:18 +02:00
d271062749
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-04-02 16:53:23 +02: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
3d9d0189e5
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-04-01 19:41:03 +02:00
98f8912e25
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-04-01 16:49:55 +02:00
b6883636ff
Updated llca to codeticket build 557744
2021-04-01 12:42:59 +03:00
242a312159
Update tracy
2021-03-31 23:30:07 +02:00
d3ed0015f5
Windows; KDU 8.1
2021-03-28 14:10:09 +02:00
73bc62975e
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-03-27 17:48:51 +01:00
8387c0e6cf
Linux; KDU update
2021-03-23 17:47:31 +01:00
af4e66d521
Add Tracy 3p to autobuild.xml
2021-03-22 01:06:53 +01:00
7e8aed44a6
Merge branch 'DRTVWR-520-apple-notarization' of https://bitbucket.org/lindenlab/viewer
2021-03-17 18:47:16 +01:00
6b73a8331f
SL-14541 removed breakpad, win_crash_logger, updated zlib
2021-03-17 00:19:38 +02:00
493200bca5
Undo Linux updates.
2021-03-09 10:40:01 +01:00
888dce7482
Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llcommon/llsys.cpp
2021-03-03 21:12:21 +01: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
748a53b8a7
Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer
2021-02-18 19:33:48 +01:00
31bb38a6f3
SL-13788 Some Intel gpus are recognized as just Intel HD Graphics
2021-02-18 18:11:20 +02:00
4e3cd245e6
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm into linux-updates
2021-02-15 17:46:45 +01:00
078b8b0e54
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-02-15 12:32:08 +01:00
098f79d7b6
Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer
2021-02-15 11:42:22 +01:00
e4f0270887
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-02-15 11:41:48 +01:00
b4afa5f1b8
Update jemalloc.
2021-02-14 14:05:51 +01:00
d82b4b9540
FMOD Studio 2.01.08 for macOS.
2021-02-13 10:04:56 -06:00
e9e203412d
Linux; fmodstudio-2.01.08
2021-02-13 16:31:40 +01:00
69dee9509c
Update FMOD Studio to 2.01.08 on Windows
2021-02-12 16:04:33 +01: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
24b2f60d1a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm into linux-updates
2021-02-06 00:18:07 +01:00
2da7bc83b5
Updated LLCA to codeticket build 555615
2021-02-02 19:08:12 +02:00
5bc39cd87d
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-02-02 17:50:49 +01:00
7ca874a6e3
Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer
2021-02-02 00:16:25 +01:00
7458601374
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-02-02 00:05:53 +01: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
b61a998574
Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer
2021-01-17 19:29:33 +01:00
1461e9bbb0
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-01-17 19:24:26 +01:00
52b3bb404c
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-01-17 12:38:03 +01: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
2ba8e979b0
It's 2021...
2021-01-03 23:35:35 +01:00
5e3d5306ee
FMOD Studio 2.01.07 for macOS.
2021-01-01 03:57:40 -06:00
28f289ef1d
FIRE-30632: Bulk Windlight import
2020-12-30 20:11:48 +01:00
c3b599af75
Linux: Update FMOD to version 2.01.07
2020-12-27 19:17:34 -08:00
9d0576be83
Update FMOD Studio to 2.01.07 on Windows
2020-12-21 18:48:04 +01:00
0ba281e843
Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer
2020-12-08 09:41:10 +01:00
6c587d437d
Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer
2020-12-02 08:17:58 +01: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
b728ee7a23
Update dullahan.
2020-11-21 14:00:19 +01:00
467412d09d
Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer
2020-11-20 23:10:28 +01:00
fc410ccb7d
Merge branch 'DRTVWR-514-keymappings' of https://bitbucket.org/lindenlab/viewer
2020-11-20 00:55:33 +01: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
3b630f2cda
Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer
2020-11-12 17:06:16 +01:00
af2abe17cd
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-11-12 00:51:42 +01: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
b96eaf544c
Linux; update dullahan
2020-11-06 18:31:46 +01:00
5b023c8ae6
SL-13740 Updated updater
2020-11-06 18:19:21 +02:00
538e8fb64e
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
2020-11-05 09:22:31 +01:00
af61974386
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-11-05 09:14:11 +01:00
597d777c9f
Updated LLCA to codeticket build 551526
2020-11-02 17:54:41 +02:00
78671526d7
Merge remote-tracking branch 'fs/master' into linux-updates
2020-10-26 21:52:11 +01:00
b49c6f7b63
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm into linux-updates
2020-10-26 21:49:51 +01:00
f2dd267bfa
Update version string
2020-10-26 12:17:30 +01:00
5e4f8c1185
OpenJPEG 2 for macOS.
2020-10-26 01:09:54 -05:00
085886fe69
OpenJPEG 2 for Linux.
2020-10-25 19:03:39 +01:00
08092b6110
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-10-24 19:53:24 +02:00
4579730714
Update macOS FMOD Studio to 2.01.05.
2020-10-24 09:53:01 -05:00
df1999f953
Merge
2020-10-22 22:31:40 +02:00
4b2a611596
Updated LLCA to codeticket build 550026
2020-10-21 16:20:47 +03:00
2db220b9e4
Linux; Update to fmodstudio-2.01.05
2020-10-19 13:56:17 +02:00
95b4dd072e
Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer
2020-10-15 11:37:14 +02:00
f9b6380689
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
2020-10-14 23:57:09 +02:00
32b5aa20c3
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-10-14 23:48:24 +02:00
22ac59cb34
Update FMOD Studio to 2.01.05 on Windows
2020-10-12 11:05:20 +02:00
5b0384ace2
Update OpenJPEG to 2.3.1 on Windows
2020-10-08 16:21:48 +02: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
b8de97f0d9
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-09-29 08:46:56 +02:00
26a389dcd5
Linux; Update to fmodstudio-2.01.04
2020-09-28 20:10:14 +02:00
108550e68e
SL-13873 update copyright date to 2020
2020-09-25 16:29:05 +03:00
b5635da9e9
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-09-23 10:08:11 +02: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
9b58e79341
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-503
2020-09-20 20:28:32 +02:00
5328e5ed11
Merge LL
2020-09-20 20:25:42 +02:00
d0fb2a173d
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-09-20 19:50:03 +02:00
db486bb26a
Update FMOD Studio for macOS to a supported vrsion.
2020-09-17 18:59:43 -05:00
2c0baf9693
Update FMOD Studio to 2.01.04 on Windows
2020-09-16 00:09:14 +02:00
05b98ec861
Updated apr_suite to codeticket build 548882
2020-09-11 23:57:31 +03:00
fe10f171d3
Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llmessage/llcoproceduremanager.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/skins/default/xui/en/panel_main_inventory.xml
# indra/newview/skins/default/xui/en/strings.xml
2020-09-09 19:34:33 +02: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
b67e99e18a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-08-20 10:44:28 +02:00
e59d10513b
macOS build fix: update ndPhysicsStub library.
2020-08-20 03:19:35 -05:00
6719815ea5
Pointless correction of version numbers
2020-08-19 19:15:23 +02:00
e19e36d7db
Linux; Update ndPhysicsStub
2020-08-19 13:26:05 +02:00
000f3be01a
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
2020-08-18 23:53:40 +02:00
0efda8f28d
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-08-18 22:41:20 +02:00
941dc882e2
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-08-18 18:24:04 +02:00
a9885029cf
Merge branch 'master' into DRTVWR-507-maint
2020-08-18 19:11:34 +03:00
460c88da8c
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-08-18 18:11:13 +02:00
7588297f57
Correct KDU path
2020-08-18 07:34:32 +02:00
37886282d4
KDU update.
2020-08-18 01:22:19 +02:00
d699769601
Add glib package and use this instead of the old glib+gtk+atk+...
2020-08-17 21:43:43 +02:00
b0b97c15db
Linux; Replace GTK file and directory ticker with FLTK.
2020-08-16 13:48:12 +02:00
7925f7c7c3
Merge remote-tracking branch 'fs/master' into linux-updates
2020-08-15 21:00:44 +02:00
1e2730ccb9
Yet another FMOD Studio update for macOS.
2020-08-14 18:13:36 -05:00
51ca23d530
Merge branch 'master' of ssh://vcs.firestormviewer.org/phoenix-firestorm
2020-08-14 19:09:31 +02:00
e989fdc5a0
Linux; Update to fmodstudio-2.01.03
2020-08-14 19:09:08 +02:00
3d4e7b6497
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-08-11 20:06:37 +02:00
d5dd2c8aeb
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-501
2020-08-11 19:52:44 +02:00
65713bc7c9
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-08-11 19:17:42 +02:00
ffd96d181a
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
2020-08-11 18:18:07 +02:00
008936b986
Linux; update ogg vorbis.
2020-08-11 17:14:01 +02: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
742813e105
macOS build fixes.
2020-08-07 21:20:05 -05: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
7658becd8d
Update FMOD Studio to 2.01.03 on Windows
2020-08-06 21:04:59 +02:00
3138e5c238
Merge branch 'DRTVWR-501-maint' of https://bitbucket.org/lindenlab/viewer
2020-08-05 10:48:51 +02:00
ed7ef49984
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
2020-08-03 21:53:04 +02: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
2f1bc356ff
Replace downloads.phoenixviewer.com with 3p.firestormviewer.org
2020-08-01 09:50:47 +02:00
2e179112c7
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-08-01 09:46:00 +02:00
dca1763e0a
Windows; updated version of ndPhysicsStub
2020-07-30 20:52:07 +02:00
3a34e7c5bf
Merge branch 'DRTVWR-501-maint' of https://bitbucket.org/lindenlab/viewer
2020-07-29 21:54:24 +02:00
a2b5f44b35
Merge branch 'DRTVWR-476' into DRTVWR-501-maint
2020-07-29 21:49:03 +03:00
67255f5d64
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-501
2020-07-29 13:23:00 +02:00
e403925705
Replace ancient and broken OpenJPEG 1.5.1 with even more ancient but actually working OpenJPEG 1.4.0 on Windows
2020-07-28 23:22:40 +02:00
77f5a06a1e
SL-13688 Reverted viewer-manager to pre-tools build
2020-07-27 20:33:52 +03:00
7380a0fd12
Update dullahan for Windows once more.
2020-07-26 17:05:46 +02:00
a8c8332784
Windows; Update dullahan to a version with volume control and without massive frame drop.
2020-07-26 01:01:28 +02:00
acb6ca2a57
Sorry Linux - no Havok for you!
2020-07-25 22:05:45 +02:00
28d21944a9
Let's try this again...
2020-07-25 21:59:48 +02:00
7697cc423c
Correct path to Havok TPV libs
2020-07-25 21:49:21 +02:00
86fde7f7ce
Revert Dullahan back to upstream version for Windows - which of course don't work as well yet due to updated 3p hasn't been built with VS2017 yet
2020-07-24 22:34:52 +02:00
85a30bd8ad
Use Firestorm dictionaries package again
2020-07-24 20:41:14 +02:00
e5677c891a
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
2020-07-24 20:15:15 +02:00
40a192448b
Windows; Update KDU to 8.0.5
2020-07-24 08:05:41 +02:00
350cf703a1
Merge branch 'DRTVWR-501-maint' of https://bitbucket.org/lindenlab/viewer
2020-07-24 00:44:20 +02:00
5ba9660e42
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-07-24 00:36:12 +02:00
39a972e36d
Linux; Update jsoncpp.
2020-07-24 00:21:40 +02:00
15b13608ba
Merge branch 'master' into linux-updates
2020-07-23 23:40:41 +02: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
73bd29b67b
Upgrade font quality by downgrading FreeType to 2.3.9 on Windows - again...
2020-07-22 00:19:43 +02:00
f77a30f740
Merge branch 'master' into DRTVWR-507-maint
...
# Conflicts:
# autobuild.xml
2020-07-21 11:30:48 +03:00
9cde6569a9
Update breakpad.
2020-07-21 00:10:13 +02:00
dacafbfaf2
Linux; Update KDU to 8.0.5
2020-07-20 21:36:55 +02:00
7bbf3f5f7f
Merge branch 'master' into DRTVWR-501-maint
...
# Conflicts:
# autobuild.xml
# indra/newview/llimprocessing.cpp
2020-07-20 22:24:10 +03:00
3b05e792c5
Updated 3Ps for GCC 5.4.0.
2020-07-20 19:26:02 +02:00
168ae7434b
Update dullahan to get volume control back.
2020-07-20 14:08:49 +02:00
c7804dbf7e
Merge remote-tracking branch 'll/d476' into fs-vs2017-d476
2020-07-20 11:53:09 +02:00
f116ea4cb7
Merge remote-tracking branch 'fs/master' into fs-vs2017-d476
...
(Note: This removed our changed dullahan, but that's okay as it is
vs2013)
2020-07-20 09:58:30 +02:00
9ee9dc841d
Switch to a dullahan version we can audio control while still have
...
workint twitch
2020-07-20 09:30:39 +02:00
c3fc5d8b3c
Linux; FMOD Studio 2.01.02 update.
2020-07-17 22:56:36 +02:00
1af77b7024
Update FMOD Studio to 2.01.02 for Windows
2020-07-17 19:59:34 +02:00
383352c61c
SL-13567 Users should have separate CEF contexts
2020-07-17 19:00:58 +03:00
605cf0077f
Update FMOD Studio for macOS to 2.01.02.
2020-07-16 11:20:25 -05:00
0c9a623179
FIRE-29653: Revert to LL's old libvlc.
2020-07-16 06:24:19 -05:00
0e2441ada5
Merge branch 'DRTVWR-501-maint' of https://bitbucket.org/lindenlab/viewer
2020-07-08 17:05:39 +02: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
a72e1418ad
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-501
2020-06-24 12:12:46 +02:00
b783174e94
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-06-24 09:31:35 +02: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
23a367bae0
Merge branch 'master' into linux-updates
2020-06-03 21:09:07 +02:00
59953e9b33
Merge remote-tracking branch 'll/d476' into fs-vs2017-d476
2020-06-03 20:51:02 +02:00
7c7e3ae8ba
Merge remote-tracking branch 'fs/master' into fs-eep-vs2017-d476
2020-06-03 19:28:05 +02:00
30ab99b249
Merge branch 'DRTVWR-512' of https://bitbucket.org/lindenlab/viewer
2020-06-03 12:30:56 +02:00
1b102c57db
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-06-03 12:30:37 +02:00
6a05670f6f
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-501
2020-06-03 09:26:07 +02:00
b80e8b2eae
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-06-03 08:49:50 +02: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
800eedb195
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-06-02 21:55:22 +02:00
77f56fa7bf
Merge branch 'DRTVWR-512' of https://bitbucket.org/lindenlab/viewer
2020-05-31 15:27:02 +02:00
2603595f6d
Windows; update dullahan to latest version.
2020-05-31 05:44:56 +02:00
545b62b2d5
Update dullahan (gcc5 version) to latest version.
2020-05-31 03:07:10 +02:00
d1f6441751
Merge branch 'master' into linux-updates
2020-05-30 18:00:33 +02:00
1cf473ad64
Merge remote-tracking branch 'origin' into linux-updates
2020-05-30 17:54:05 +02:00
a38df4c9b1
Update dullahan to latest version.
2020-05-30 01:34:59 +02:00
a8117a5430
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-05-29 23:30:11 +02:00
fe10e1ac46
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-05-28 22:07:28 +02:00
3af3ecbf79
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-05-28 08:15:23 +02:00
24a0b190ba
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep
2020-05-27 12:17:40 +02:00
3a4921f6a1
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-501
2020-05-27 11:02:53 +02:00
6232288c59
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep
2020-05-27 09:45:48 +02:00
714501f389
Linux; Update to latest dullahan/CEF.
2020-05-24 20:10:49 +02:00
c86c3d3157
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-05-24 16:50:27 +02:00
f0d7598991
Merge branch 'master' into dullahan_16
2020-05-23 23:28:48 +02:00
2f1a6f092f
Update dullahan.
2020-05-23 23:22:09 +02:00
81ee7787f9
Linux; FMOD Studio 2.01.01
2020-05-22 21:36:34 +02: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
Ansariel