f4182ddc7f
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llreflectionmapmanager.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewershadermgr.cpp
# indra/newview/llworldmapview.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/panel_tools_texture.xml
2023-03-06 17:11:43 +01:00
49a761189e
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-02-17 13:58:10 +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
7d4b0cd657
Updated tracy packages and config for tracy-v0.8.1 for SL-18563
2023-02-10 16:02:24 -08:00
3fd8bc04c2
Upgraded tracy package and enabled for mac with USE_TRACY for work on mac perfomance SL-18563
...
```
autobuild installables edit "tracy" url="https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110561/960415/tracy-v0.7.8.578230-darwin64-578230.tar.bz2 " hash="70f31fa71ecb52bd092da52e27c3ff8c"
autobuild installables edit "tracy" url="https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110562/960424/tracy-v0.7.8.578230-windows-578230.tar.bz2 " hash="1dc33422939adf015db85e96c5a8276e"
autobuild installables edit "tracy" url="https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110563/960429/tracy-v0.7.8.578230-windows64-578230.tar.bz2 " hash="fcc6ecece2ecb65aa36500dfa9461fb3"
```
2023-02-10 11:26:14 -08:00
645cca9765
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-02-10 10:52:46 +01: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
73e5615d43
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/llimagej2coj/llimagej2coj.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/app_settings/shaders/class1/deferred/skyF.glsl
# indra/newview/app_settings/shaders/class1/deferred/skyV.glsl
# indra/newview/app_settings/shaders/class2/deferred/skyF.glsl
# indra/newview/llsettingsvo.cpp
2023-02-03 11:11:13 +01:00
f156e0771f
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-02-03 00:55:58 +01:00
5fabfa50d7
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-02-02 12:11:40 -08:00
6cbca4da71
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llprofiler.h
# indra/llcommon/lluuid.cpp
# indra/llprimitive/llmodel.cpp
# indra/llrender/llrendertarget.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/app_settings/shaders/class1/deferred/multiPointLightF.glsl
# indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl
# indra/newview/llviewerwindow.cpp
# indra/newview/pipeline.cpp
# 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-01 11:40:17 +01:00
b5b0a3fbf6
SL-19110 Fix xxhash build link and properly register contribution
2023-01-31 22:05:42 +02:00
473ade2696
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 22:04:14 +02:00
aa895515b2
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/llviewercontrol.cpp
2023-01-19 18:50:52 +01: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
4f4c9c7473
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-01-12 12:21:57 +01:00
0de318cb5e
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/llwindow/llwindowwin32.cpp
2023-01-04 15:30:47 +01:00
f359a39195
Flip dates to 2023
2023-01-02 19:19:28 +01:00
f7063cecdd
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/llmath/llvolume.cpp
# indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
# indra/newview/llappviewer.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewertexturelist.h
2022-12-14 10:13:07 +01:00
eb526fec0a
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2022-12-12 17:59:34 -08:00
67081f9728
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llfloater360capture.cpp
2022-12-12 22:09:54 +01:00
f836194516
Merge branch 'main' into DRTVWR-570-maint-Q
...
# Conflicts:
# doc/contributions.txt
# indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
# indra/newview/llfloater360capture.cpp
2022-12-12 20:53:11 +02:00
2db96d32b8
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-11-30 21:12:29 +01:00
a887c486b4
Merge remote-tracking branch 'origin/DRTVWR-528' into DRTVWR-559
2022-11-28 16:24:53 -08:00
a7d55b4e77
Merge branch 'DRTVWR-570-maint-Q' of https://github.com/secondlife/viewer
2022-11-22 16:30:35 +01:00
8f45ad9323
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-11-22 16:29:17 +01:00
abbfb9b7d0
Merge branch 'DRTVWR-565-maint-P' of https://github.com/secondlife/viewer
2022-11-22 16:23:13 +01:00
02804db43b
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-11-22 16:21:05 +01:00
25c62f554f
Merge branch 'master' into DRTVWR-570-maint-Q
2022-11-21 22:46:35 +02:00
c8f08f232a
SL-18218: Switch canonical_repo to GitHub URL
2022-11-21 11:51:53 -08:00
dbc70be7c4
Merge branch 'master' of https://github.com/secondlife/viewer
...
# Conflicts:
# README.md
# autobuild.xml
2022-11-21 20:37:32 +01:00
96f0c95898
Merge branch master into DRTVWR-565-maint-P
2022-11-21 20:48:24 +02:00
a8ded3bcc4
SL-17135 Pull in apr-suit package
...
Same apr suit version, but with debug symbols
2022-11-18 14:43:54 +02:00
73ca604ad5
SL-18618 Update libpng
2022-11-15 01:13:33 +02:00
bedbd98017
SL-18603 update Bugsplat
2022-11-11 23:05:25 +02:00
10588d606e
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-11-02 12:54:26 +01:00
1bdfb7df70
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-11-01 15:16:40 +01:00
b48f34b24c
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-11-01 14:04:55 +01:00
66cecee628
Linux: Update fontconfig and freetype to remove old zlib dependency - Thanks to PorkChop!
2022-10-30 20:30:12 +01:00
30b2b65d70
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-10-26 21:19:41 +02:00
a1090f5f5d
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llrendertarget.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/quickprefs.cpp
2022-10-24 19:54:30 +02:00
e4816961a4
Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer
2022-10-22 16:53:15 +02:00
f7721b5386
Update FMOD Studio to 2.02.09 on Mac
2022-10-21 23:34:40 +02:00
8b0d341aca
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-10-21 12:34:53 +02:00
534a156f2b
Linux: Update PNG library to have one less dependency on old zlib - Patch and 3p build by PorkChop, thank you!
2022-10-21 01:43:36 +02:00
914ca9acae
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-10-20 09:21:47 +02:00
Ansariel