Ansariel
a7d55b4e77
Merge branch 'DRTVWR-570-maint-Q' of https://github.com/secondlife/viewer
2022-11-22 16:30:35 +01:00
Ansariel
8f45ad9323
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-11-22 16:29:17 +01:00
Andrey Lihatskiy
25c62f554f
Merge branch 'master' into DRTVWR-570-maint-Q
2022-11-21 22:46:35 +02:00
Ansariel
dbc70be7c4
Merge branch 'master' of https://github.com/secondlife/viewer
...
# Conflicts:
# README.md
# autobuild.xml
2022-11-21 20:37:32 +01:00
Andrey Kleshchev
a8ded3bcc4
SL-17135 Pull in apr-suit package
...
Same apr suit version, but with debug symbols
2022-11-18 14:43:54 +02:00
Andrey Kleshchev
73ca604ad5
SL-18618 Update libpng
2022-11-15 01:13:33 +02:00
Ansariel
1bdfb7df70
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-11-01 15:16:40 +01:00
Zi Ree
66cecee628
Linux: Update fontconfig and freetype to remove old zlib dependency - Thanks to PorkChop!
2022-10-30 20:30:12 +01:00
Kitty Barnett
f7721b5386
Update FMOD Studio to 2.02.09 on Mac
2022-10-21 23:34:40 +02:00
Ansariel
8b0d341aca
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-10-21 12:34:53 +02:00
Zi Ree
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
Ansariel
914ca9acae
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-10-20 09:21:47 +02:00
Bennett Goble
ffc6ed2a93
SL-18218: Switch canonical_repo to GitHub URL
2022-10-17 13:22:56 -07:00
Zi Ree
1a17c8df44
Linux: fmodstudio update, patch by PorkChop, thank you!
2022-10-17 05:01:18 +02:00
Ansariel
562fd838a2
Update FMOD Studio to 2.02.09 on Windows
2022-10-16 12:21:35 +02:00
Ansariel
2b65ae8215
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
2022-10-15 17:33:22 +02:00
Ansariel
ec6c0c7fa0
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-10-15 17:28:34 +02:00
Zi Ree
1add5d049a
Linux/SDL2: update to SDL2-24-0, thanks PorkChop - might already help with FIRE-32074
2022-10-15 16:02:21 +02:00
Andrey Kleshchev
ad48f88d1f
SL-16542 Fixed openjpeg library's name
2022-10-04 19:51:16 +03:00
Ansariel
7b2fa92f0e
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/OpenJPEG.cmake
# indra/llimagej2coj/llimagej2coj.cpp
# indra/newview/CMakeLists.txt
# indra/newview/llpanelprofile.cpp
# indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
# indra/newview/viewer_manifest.py
2022-10-04 14:17:44 +02:00
Andrey Kleshchev
5404708de0
SL-16542 Fix mac build not having some of openjpeg headers
2022-10-03 21:09:47 +03:00
Andrey Kleshchev
c844bf0ab8
SL-16542 Pull in chunks of graham's openjpeg code, update openjpeg and enable partial bitstreams
...
Openjpeg was modified: "p_max_len -= l_nb_bytes_read;" was causing an overflow.
I'm not sure if I did something incorectly in opj_skip/opj_seek viewer side, but seems like openjpeg should have been checking remaining space in p_max_len either way.
P.S. Many thanks to Chafey and Neopallium for implementing openjpeg's partial bitstream support
2022-10-01 11:25:14 +03:00
Ansariel
31c3417ce6
Update FMOD Studio on OSX with package built by Kitty
2022-09-26 14:44:49 +02:00
Zi Ree
3e52bb4314
Linux - FModStudio update - packaged by PorkChop, thank you!
2022-09-23 17:40:59 +02:00
Ansariel
1b3bf53ff3
Update FMOD Studio to 2.02.08 on Windows
2022-09-23 12:36:28 +02:00
Zi Ree
71ab85a0c2
Linux - Update jemalloc 3p library for better memory management - Patch by PorkChop, thank you!
2022-09-20 17:46:35 +02:00
Zi Ree
09a30fa49e
Fixed bogus SDL2 conflicts every time autobuild.xml was touched. Patch by PorkChop, thank you!
2022-09-18 17:14:31 +02:00
Zi Ree
85db6ad4d5
New CEF and Dullahan for Linux, picking up fixes for MOAP issues - new libraries built by PorkChop. Thank you!
2022-09-17 05:41:29 +02:00
Ansariel
cf85e854e5
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
2022-09-15 21:14:13 +02:00
Callum Linden
3248eb87dc
SL-18151 [SEC] MOAP can force multiple floaters open on users screen: The Viewer part of the fix for this JIRA - pulls in the updated Dullahan that exposes the user_gesture/is_redirect flags and uses them to determine what type of 'nav_type' is exchanged with viewer/plugin
2022-09-14 14:52:31 -07:00
Ansariel
db864c11cd
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-09-13 20:14:22 +02:00
Liny
745ad55aa2
Fix FIRE-32044 Voice cannot be used in a pure 64-bit Linux environment.
2022-09-10 16:37:14 -07:00
Zi Ree
6d3248cc17
FIRE-31945 - 3p-SDL2 rebuild done by PorkChop to include inpout methods for japanese text entry in the configure flags, as an attempt to fix this issue
2022-09-09 17:49:58 +02:00
Zi Ree
c987ab1bbe
Update libndof to use SDL2 - patch by PorkChop, thank you!
2022-09-02 16:58:25 +02:00
Ansariel
2f42e999e0
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/llhudtext.cpp
# indra/newview/llpanelpicks.cpp
# indra/newview/llpanelprofile.cpp
2022-08-31 16:04:49 +02:00
Nicky
6f2265d387
Linux; Updated colladadom, compiled for C++17 support; Original author "Pork Chop <mygoditsfullofstars@phoenixviewer.com>"
2022-08-14 16:03:39 +02:00
Nicky
c7e04f0cae
Mac; Update Collada with a C++17 compatible version.
2022-08-11 22:29:02 +02:00
Ansariel
4d5b5a5ae3
Enable c++17 since it seems LL is hesitant to finally do it...
2022-08-11 21:56:48 +02:00
Ansariel
11e6cf4980
Fix wrong name
2022-08-10 19:32:37 +02:00
Nicky
1147d8ee1e
Update fmodstudio
2022-08-07 14:22:52 +02:00
Ansariel
d7953c1e94
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-08-02 12:03:54 +02:00
Zi Ree
5230df4b14
Linux - Update 3p libs, fix linux-crash-logger, contributed by Pork Chop, thank you!
2022-08-01 13:35:25 +02:00
Ansariel
f583a8233d
No need for 32bit OSX/Linux GLOD
2022-08-01 12:08:59 +02:00
Beq
00875f93d0
Restore GLOD alongside MeshOpt
2022-07-31 22:11:35 +01:00
Nicky
5be4dd156c
OSX; update fmodstudio to 2.02.07
2022-07-24 13:20:32 +02:00
Ansariel
d407396a00
Update FMOD Studio to 2.02.07 on Windows
2022-07-23 12:54:26 +02:00
Ansariel
9300613edc
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
2022-06-29 21:57:31 +02:00
Ansariel
fc11575657
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
2022-06-29 20:28:29 +02:00
Andrey Lihatskiy
77ce594dec
Merge branch 'master' into DRTVWR-544-maint
2022-06-29 20:31:17 +03:00
Ansariel
bd414ee0d0
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
2022-06-29 17:21:22 +02:00