ffc6ed2a93
SL-18218: Switch canonical_repo to GitHub URL
2022-10-17 13:22:56 -07:00
1a17c8df44
Linux: fmodstudio update, patch by PorkChop, thank you!
2022-10-17 05:01:18 +02:00
562fd838a2
Update FMOD Studio to 2.02.09 on Windows
2022-10-16 12:21:35 +02:00
2b65ae8215
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
2022-10-15 17:33:22 +02:00
ec6c0c7fa0
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-10-15 17:28:34 +02:00
1add5d049a
Linux/SDL2: update to SDL2-24-0, thanks PorkChop - might already help with FIRE-32074
2022-10-15 16:02:21 +02:00
46d4775eca
SL-18378 Update fmod studio to 2.02.09
...
Should fix some common crashes for parcel media
2022-10-14 20:16:31 +03:00
ad48f88d1f
SL-16542 Fixed openjpeg library's name
2022-10-04 19:51:16 +03:00
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
7018deb7f8
SL-18289: Modify autobuild.xml to insert a CMaker architecture flag as well as the generator string for Windows builds
2022-10-03 11:31:44 -07:00
5404708de0
SL-16542 Fix mac build not having some of openjpeg headers
2022-10-03 21:09:47 +03:00
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
31c3417ce6
Update FMOD Studio on OSX with package built by Kitty
2022-09-26 14:44:49 +02:00
3e52bb4314
Linux - FModStudio update - packaged by PorkChop, thank you!
2022-09-23 17:40:59 +02:00
1b3bf53ff3
Update FMOD Studio to 2.02.08 on Windows
2022-09-23 12:36:28 +02:00
45aef2c318
Linux - make it compile on linux, gstreamer 0.1 for now, needs to be moved to 1.0, cef probably fails when compiled with volume catcher enabled
2022-09-20 19:29:39 +02:00
71ab85a0c2
Linux - Update jemalloc 3p library for better memory management - Patch by PorkChop, thank you!
2022-09-20 17:46:35 +02:00
09a30fa49e
Fixed bogus SDL2 conflicts every time autobuild.xml was touched. Patch by PorkChop, thank you!
2022-09-18 17:14:31 +02:00
1fc3aaff9b
Merge branch 'DRTVWR-568_cmake' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# .gitignore
# autobuild.xml
# indra/CMakeLists.txt
# indra/cmake/00-Common.cmake
# indra/cmake/Boost.cmake
# indra/cmake/BuildVersion.cmake
# indra/cmake/CEFPlugin.cmake
# indra/cmake/CMakeLists.txt
# indra/cmake/CURL.cmake
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/DBusGlib.cmake
# indra/cmake/DragDrop.cmake
# indra/cmake/FMODSTUDIO.cmake
# indra/cmake/FindHUNSPELL.cmake
# indra/cmake/FindJsonCpp.cmake
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/FindURIPARSER.cmake
# indra/cmake/FreeType.cmake
# indra/cmake/GLH.cmake
# indra/cmake/Hunspell.cmake
# indra/cmake/JsonCpp.cmake
# indra/cmake/LLKDU.cmake
# indra/cmake/LLPhysicsExtensions.cmake
# indra/cmake/LLPlugin.cmake
# indra/cmake/LLWindow.cmake
# indra/cmake/Linking.cmake
# indra/cmake/MESHOPTIMIZER.cmake
# indra/cmake/MediaPluginBase.cmake
# indra/cmake/NGHTTP2.cmake
# indra/cmake/OPENAL.cmake
# indra/cmake/OpenGL.cmake
# indra/cmake/OpenJPEG.cmake
# indra/cmake/OpenSSL.cmake
# indra/cmake/PNG.cmake
# indra/cmake/Tracy.cmake
# indra/cmake/UI.cmake
# indra/cmake/Variables.cmake
# indra/cmake/ViewerMiscLibs.cmake
# indra/cmake/ZLIBNG.cmake
# indra/cmake/bugsplat.cmake
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/linux_crash_logger/CMakeLists.txt
# indra/llaudio/CMakeLists.txt
# indra/llcommon/CMakeLists.txt
# indra/llcommon/llapp.cpp
# indra/llcorehttp/CMakeLists.txt
# indra/llimagej2coj/CMakeLists.txt
# indra/llinventory/CMakeLists.txt
# indra/llmath/CMakeLists.txt
# indra/llmath/llcalcparser.h
# indra/llmessage/CMakeLists.txt
# indra/llprimitive/CMakeLists.txt
# indra/llrender/CMakeLists.txt
# indra/llrender/llglslshader.cpp
# indra/llwindow/CMakeLists.txt
# indra/media_plugins/CMakeLists.txt
# indra/media_plugins/base/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llappviewerwin32.cpp
# indra/newview/llxmlrpclistener.cpp
# indra/newview/llxmlrpctransaction.cpp
# indra/newview/viewer_manifest.py
# indra/test/CMakeLists.txt
2022-09-17 23:12:34 +02:00
c333a7935d
SL-17238 Fixed llphysicsextensions connection to llrender
2022-09-17 19:30:31 +03:00
0e325eab28
Merge branch 'DRTVWR-568' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# autobuild.xml
# indra/CMakeLists.txt
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/Python.cmake
# indra/llcommon/llsd.h
# indra/llcommon/llstl.h
# indra/llinventory/llparcel.cpp
# indra/llmessage/llmessagethrottle.cpp
# indra/llui/lldockablefloater.h
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfavoritesbar.cpp
# indra/newview/llfloater360capture.cpp
# indra/newview/llfloaterregioninfo.cpp
# indra/newview/llwatchdog.cpp
# indra/newview/viewer_manifest.py
2022-09-17 14:37:33 +02:00
d42ea69ea6
SL-17238 Fixed llphysicsextensions connection to llrender
2022-09-17 14:03:55 +03:00
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
0710d95f4b
Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-568_cmake
2022-09-16 23:15:49 +02:00
5f1c8d3119
SL-18068: Update to viewer-manager build 575083
2022-09-16 16:24:05 -04:00
f08f20db5f
Merge branch 'master' into DRTVWR-568
2022-09-15 17:00:34 -07:00
cf85e854e5
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
2022-09-15 21:14:13 +02:00
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
db864c11cd
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-09-13 20:14:22 +02:00
745ad55aa2
Fix FIRE-32044 Voice cannot be used in a pure 64-bit Linux environment.
2022-09-10 16:37:14 -07:00
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
c987ab1bbe
Update libndof to use SDL2 - patch by PorkChop, thank you!
2022-09-02 16:58:25 +02:00
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
ef58b9751a
DRTVWR-568: Pull in new 3p-colladadom build, tweak to VSVER number hardcoded into autobuild.xml for VS 2022 and update cmake script to copy the MSVC runtime (proper fix coming
2022-08-30 15:20:04 -07:00
35de5fc912
SL-18021 Generate a VS 2019 build of the Viewer using current third party libraries: replace hard coded VS 2017 '150' maginc number with another magic number - for VS 2019
2022-08-25 10:04:02 -07:00
6f2265d387
Linux; Updated colladadom, compiled for C++17 support; Original author "Pork Chop <mygoditsfullofstars@phoenixviewer.com>"
2022-08-14 16:03:39 +02:00
c7e04f0cae
Mac; Update Collada with a C++17 compatible version.
2022-08-11 22:29:02 +02:00
4d5b5a5ae3
Enable c++17 since it seems LL is hesitant to finally do it...
2022-08-11 21:56:48 +02:00
11e6cf4980
Fix wrong name
2022-08-10 19:32:37 +02:00
1147d8ee1e
Update fmodstudio
2022-08-07 14:22:52 +02:00
d7953c1e94
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-08-02 12:03:54 +02:00
5230df4b14
Linux - Update 3p libs, fix linux-crash-logger, contributed by Pork Chop, thank you!
2022-08-01 13:35:25 +02:00
f583a8233d
No need for 32bit OSX/Linux GLOD
2022-08-01 12:08:59 +02:00
00875f93d0
Restore GLOD alongside MeshOpt
2022-07-31 22:11:35 +01:00
5be4dd156c
OSX; update fmodstudio to 2.02.07
2022-07-24 13:20:32 +02:00
d407396a00
Update FMOD Studio to 2.02.07 on Windows
2022-07-23 12:54:26 +02:00
9300613edc
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
2022-06-29 21:57:31 +02:00
fc11575657
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
2022-06-29 20:28:29 +02:00
77ce594dec
Merge branch 'master' into DRTVWR-544-maint
2022-06-29 20:31:17 +03:00
bd414ee0d0
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
2022-06-29 17:21:22 +02:00
95d5938eef
Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-543-maint_cmake
2022-06-05 14:27:28 +02:00
a0c7370ce3
Update Havok
2022-06-03 20:26:02 +02:00
9b0569840f
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/llprimitive/llmodel.cpp
# indra/llprimitive/llmodel.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
2022-05-31 01:58:09 +03:00
7d7aff4377
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
...
# Conflicts:
# indra/llprimitive/llmodel.cpp
# indra/llprimitive/llmodel.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/llinventorymodel.h
2022-05-28 23:00:17 +02:00
a426e8ddb3
DRTVWR-543 post-merge cleanup
2022-05-27 19:05:14 +03:00
6ccdf5545d
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
...
# Conflicts:
# autobuild.xml
# indra/llcommon/CMakeLists.txt
# indra/llrender/llgl.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llflexibleobject.cpp
# indra/newview/llvovolume.cpp
2022-05-27 11:41:45 +02:00
3da7a50b71
Merge branch 'master' into DRTVWR-543-maint
...
# Conflicts:
# autobuild.xml
# indra/cmake/LLCommon.cmake
# indra/llcommon/CMakeLists.txt
# indra/llrender/llgl.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llflexibleobject.cpp
# indra/newview/llvovolume.cpp
2022-05-27 02:51:33 +03:00
14e3104f86
SL-17452 Fixed anscii usage dullahan side
2022-05-21 01:11:38 +03:00
a4d60d06ec
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-05-05 10:43:31 +02:00
7991aaffa0
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-05-05 09:59:12 +02:00
6e83be2167
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-04-29 14:27:09 +02:00
5b7825df1e
Update SDL2.
2022-04-25 21:25:46 +02:00
e5f684f085
Make SDL2 a cmake option, use SDL2 Mixer for audio playback, this might open a good way to a full open source way (no FModStudio needed). But here be dragons still.
2022-04-25 21:24:29 +02:00
15354e86ba
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
2022-04-21 14:27:51 +02:00
c944641900
SL-17240 slvoice notarization fix
2022-04-20 02:14:27 +03:00
b8b0c8ec3b
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-04-19 15:42:14 +02:00
2daf0cb2fd
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llfloatersearch.cpp
# indra/newview/llgroupactions.cpp
# indra/newview/llvovolume.cpp
2022-04-19 14:24:09 +02:00
c1a4be7dae
Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/Boost.cmake
# indra/llappearance/lltexlayer.cpp
# indra/llinventory/llparcel.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
2022-04-19 13:21:52 +02:00
1aaa765d26
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-04-19 12:33:48 +02:00
ad0aa3422f
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
2022-04-19 00:23:41 +02:00
07040f7eb0
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-04-19 00:15:01 +02:00
ce4c694b66
Merge branch master (D540) into DRTVWR-546
...
# Conflicts:
# indra/llcommon/llsdutil.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolwater.cpp
2022-04-18 23:42:39 +03:00
ca839307f9
Merge remote-tracking branch 'origin/DRTVWR-543-maint' into DRTVWR-543-maint_cmake
2022-04-18 19:57:34 +02:00
026ad511ea
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llfloatersearch.cpp
# indra/newview/llgroupactions.cpp
# indra/newview/llvovolume.cpp
2022-04-18 20:43:49 +03:00
dbb044e9bb
Merge branch 'master' into DRTVWR-543-maint
2022-04-18 20:38:06 +03:00
54f8d5c380
Bring in first steps of Linux64:
...
- Add the configuratons Release and ReleaseOS
- The js files are platform independent, just copy the ones from windows64.
2022-04-18 03:02:50 +02:00
34b5c5e890
Switch to USE_OPENAL
2022-04-16 23:01:00 +02:00
94973e736c
SL-17224 Update FMOD to version 2.02.06
2022-04-15 21:27:50 +03:00
d898151f25
Linux; update glib, fmodstudio and kdu
2022-04-01 15:25:40 +00:00
ae4f64eee7
SL-17079: Merge 'sl-17079' into DRTVWR-546 for Mac updater fix.
2022-03-28 16:45:22 -04:00
9e2f571687
SL-17079: Merge 'sl-17079' into DRTVWR-540-maint for updater fix.
2022-03-28 16:43:22 -04:00
4ae2ce7d92
Update FMOD Studio to 2.02.06 on Mac
2022-03-28 17:19:25 +02:00
2a4cecdc6c
Update FMOD Studio to 2.02.06 on Windows
2022-03-28 11:15:02 +02:00
9d7f8156c6
SL-17079: Update to viewer-manager build 569958
2022-03-25 15:53:28 -04:00
b79d1ac171
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-03-08 14:19:36 +01:00
ae4a769345
Update 3p for voice again, remove some so's that causes problems.
2022-03-06 20:07:45 +01:00
3e1619d2fc
SL-14541 Pull in updated collada
2022-03-05 22:52:00 +02:00
51e318fd8d
SL-14541 Pull in updated zlib-ng
...
Nicky Dasmijn's contribution for zlib-ng Linux builds
2022-03-05 11:34:13 +02:00
ef88337eef
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/viewer_manifest.py
2022-03-02 10:12:19 +01:00
de70b18dd1
Linux; Update slvoice, include 32 bit libs.
2022-03-01 22:44:44 +01:00
892500ee41
Merge branch 'DRTVWR-540-maint' of https://bitbucket.org/lindenlab/viewer
2022-03-01 19:34:34 +01:00
d34e3a9ab4
Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer
2022-03-01 19:31:32 +01:00
a74de2d794
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-03-01 19:14:31 +01:00
e10dea5fe2
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-03-01 18:09:12 +01:00
97a103255e
Merge branch 'master' (DRTVWR-557) into DRTVWR-546
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/cmake/GLOD.cmake
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/viewer_manifest.py
2022-03-01 13:41:42 +02:00
25f974d77d
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-03-01 10:00:36 +01:00
c5e258f40f
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-03-01 08:38:19 +01:00
fa9d4927f4
Merge remote-tracking branch 'NickyD/viewer-cleanup:master' into DRTVWR-543-maint
...
# Conflicts:
# autobuild.xml
2022-03-01 02:59:15 +02:00
43031968a6
Merge remote-tracking branch 'll/master'
2022-02-28 22:04:05 +01:00
1e0eafd50c
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/newview/llviewerregion.cpp
2022-02-28 21:56:25 +02:00
Bennett Goble