2a6c81f1d6
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-05-02 17:52:00 +02:00
1aba1c157a
Fix linux build
2023-04-24 12:29:20 +02:00
1ded14fa3d
Fix linux build
2023-04-24 12:28:00 +02:00
0d5282a99e
Add missing build targets
2023-04-22 18:55:00 +02:00
7e563d3120
Sync autobuild with upstream
2023-04-22 18:54:59 +02:00
054d2e1d33
Merge branch 'DRTVWR-539' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/newview/skins/default/xui/en/notifications.xml
2023-04-22 18:54:43 +02:00
d3dc0e1e27
Add missing build targets
2023-04-22 02:01:37 +02:00
a514fa7b19
Sync autobuild with upstream
2023-04-22 01:43:09 +02:00
94a7b3ab8e
Merge branch 'DRTVWR-577-maint-S' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
2023-04-21 15:14:43 +02:00
7dfe73540c
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-04-21 12:23:05 +02:00
4e47e532f8
Merge branch 'SL-19594-fakesmile' into DRTVWR-577-maint-S
2023-04-19 23:15:28 +03:00
86846ffb8d
SL-19594: Update to bugsplat build 579696
2023-04-19 15:35:47 -04:00
63eafec8d8
Linux: Update 3p again, wrong colladadom 3p (and associated 3p's it depended on) had crept into the dependency chain.
2023-04-04 12:06:28 +10:00
b1e8f003e6
Linux: Update various 3p libraries
2023-04-02 23:07:44 +10:00
7625a540e4
FMOD Studio update to 2.02.13 for crappy Mac, attempt #2
2023-03-31 09:46:42 +02:00
36fc36432d
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/cmake/CMakeLists.txt
2023-03-30 12:20:59 +02:00
492a11fe8b
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-573
2023-03-30 02:53:56 +02:00
69fd2d9973
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/cmake/00-Common.cmake
2023-03-30 02:49:33 +02:00
a562244671
No FMOD Update for you, crappy Mac!
...
This reverts commit c9d2db1775
2023-03-30 02:45:02 +02:00
5217e6bfb7
Merge branch 'main' into DRTVWR-577-maint-S
...
# Conflicts:
# indra/cmake/CMakeLists.txt
# indra/newview/skins/default/xui/es/floater_tools.xml
2023-03-30 00:25:16 +03:00
c9d2db1775
Update FMOD Studio to 2.02.13 on OSX
2023-03-29 16:06:35 +02:00
62a57b441a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-03-28 18:02:32 +02:00
b3d9c81370
Linux: Update FMOD Studio to 2.02.13
2023-03-27 22:40:02 +11:00
2c581cb994
Update FMOD Studio to 2.02.13 on Windows
2023-03-27 11:50:32 +02:00
5c8d7d748b
Linux: Initial work to fix broken build, restore gstreamer 1.0
2023-03-23 21:56:53 +11:00
f6ba8306f0
SL-18876 Update fmod studion to version 2.02.13
...
Should fix "Radio/Stream hiccups at a regular rate during playback"
2023-03-22 20:19:23 +02:00
40b731eb76
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-568
...
# Conflicts:
# .gitignore
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/FreeType.cmake
# indra/cmake/OpenJPEG.cmake
# indra/cmake/UI.cmake
# indra/cmake/ViewerMiscLibs.cmake
# indra/llwindow/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/viewer_manifest.py
2023-03-21 10:57:56 +01:00
dca3c83cd9
Merge branch 'DRTVWR-568' into DRTVWR-573-maint-R
...
# Conflicts:
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/OpenJPEG.cmake
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/newview/CMakeLists.txt
2023-03-20 01:23:16 +02:00
2c03c96b3e
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-03-07 13:23:03 +01:00
d9e2115374
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-03-07 12:47:54 +01:00
baa9c6d731
Linux: CEF bump from 91 -> 92 -- note, it is not possible to upgrade to later versions of CEF beyond 92 due to API changes introduced in later versions of CEF - this situation will of course change once the viewer source is updated to be compatible with the later CEF API's
2023-02-17 02:59:35 +11:00
5bbf10db62
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-02-14 22:03:06 +01:00
6c54c9f8a9
Merge branch 'main' into DRTVWR-577-maint-S
...
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/newview/llfilepicker.h
# indra/newview/llfilepicker_mac.h
# indra/newview/llfilepicker_mac.mm
2023-02-09 22:33:52 +02:00
afede9086a
Linux: Update openjpeg library (now built on focal). Previous version built on Bionic (which is imminent of being EOL) introduced some compatibility issues on systems with glibc 2.31 and beyond and resulted in linker failures.
2023-02-06 11:36:24 +11:00
9cee21ba8d
Updated Havok TPV lib to work with latest LL release
2023-02-05 15:20:34 +01:00
5eae4f873f
Linux: Update openjpeg library from 2.3.1 to 2.5.0
2023-02-05 07:10:20 +11:00
dd3dd51791
Linux: Update apr suite (sync with latest from LL)
2023-02-05 07:09:01 +11:00
fb727de6e3
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/newview/llfilepicker.h
# indra/newview/llfilepicker_mac.h
# indra/newview/llfilepicker_mac.mm
# indra/newview/llmeshrepository.cpp
2023-02-03 22:33:41 +01:00
2ff9900cd9
Merge branch 'DRTVWR-577-maint-S' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llcommon/lluuid.cpp
# indra/llprimitive/llmodel.cpp
# indra/newview/llfilepicker.cpp
# indra/newview/llfilepicker_mac.mm
# indra/newview/skins/default/xui/da/floater_about.xml
# indra/newview/skins/default/xui/de/floater_about.xml
# indra/newview/skins/default/xui/en/floater_about.xml
# indra/newview/skins/default/xui/es/floater_about.xml
# indra/newview/skins/default/xui/fr/floater_about.xml
# indra/newview/skins/default/xui/it/floater_about.xml
# indra/newview/skins/default/xui/pt/floater_about.xml
# indra/newview/skins/default/xui/ru/floater_about.xml
# indra/newview/skins/default/xui/tr/floater_about.xml
# indra/newview/skins/default/xui/zh/floater_about.xml
2023-02-03 20:57:40 +01:00
130ac29ea6
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-02-03 12:58:42 +01:00
f156e0771f
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-02-03 00:55:58 +01:00
7a5381b39f
Merge branch 'main' into DRTVWR-573-maint-R
2023-02-02 21:51:07 +02:00
8518154426
SL-19110 Fix xxhash build link and properly register contribution
2023-01-31 19:17:34 +02:00
9438ef5f79
SL-19110 Fast hashing classes for use in place of the slow LLMD5, where speed matters. ( #64 )
...
This commit adds the HBXX64 and HBXX128 classes for use as a drop-in
replacement for the slow LLMD5 hashing class, where speed matters and
backward compatibility (with standard hashing algorithms) and/or
cryptographic hashing qualities are not required.
It also replaces LLMD5 with HBXX* in a few existing hot (well, ok, just
"warm" for some) paths meeting the above requirements, while paving the way for
future use cases, such as in the DRTVWR-559 and sibling branches where the slow
LLMD5 is used (e.g. to hash materials and vertex buffer cache entries), and
could be use such a (way) faster algorithm with very significant benefits and
no negative impact.
Here is the comment I added in indra/llcommon/hbxx.h:
// HBXXH* classes are to be used where speed matters and cryptographic quality
// is not required (no "one-way" guarantee, though they are likely not worst in
// this respect than MD5 which got busted and is now considered too weak). The
// xxHash code they are built upon is vectorized and about 50 times faster than
// MD5. A 64 bits hash class is also provided for when 128 bits of entropy are
// not needed. The hashes collision rate is similar to MD5's.
// See https://github.com/Cyan4973/xxHash#readme for details.
2023-01-31 18:42:51 +02:00
34a444b0b2
Linux: Update FMOD 3p - Patch by PorkChop, thank you!
2023-01-19 12:49:14 +01:00
f8f4c43658
Update FMOD Studio to 2.02.11 for Windows
2023-01-18 19:23:04 +01:00
b157ab47c0
Merge branch 'DRTVWR-573-maint-R' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/newview/llagentui.cpp
# indra/newview/llcallingcard.cpp
# indra/newview/llfloateravatarrendersettings.cpp
# indra/newview/llimview.cpp
# indra/newview/llimview.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/skins/default/xui/de/floater_tools.xml
# indra/newview/skins/default/xui/en/floater_display_name.xml
# indra/newview/skins/default/xui/en/floater_tools.xml
# indra/newview/skins/default/xui/es/floater_tools.xml
# indra/newview/skins/default/xui/ru/floater_tools.xml
2023-01-12 16:56:08 +01:00
4f4c9c7473
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-01-12 12:21:57 +01:00
f9866a3543
Merge branch 'main' into DRTVWR-573-maint-R
...
# Conflicts:
# autobuild.xml
# indra/newview/llagent.cpp
# indra/newview/llimview.cpp
# indra/newview/llimview.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llpanelmediasettingsgeneral.cpp
# indra/newview/pipeline.cpp
2023-01-12 04:37:42 +02:00
f359a39195
Flip dates to 2023
2023-01-02 19:19:28 +01:00
Ansariel