188b3ae9b1
FMOD Studio update to 2.02.18 for Linux
2023-10-08 00:11:28 +11:00
352d39e3df
FMOD Studio update to 2.02.08 for Windows
2023-10-07 14:01:17 +02:00
6d3fa5f13f
SL-18837: Update Tracy to 0.8.1-235e98f
2023-10-06 12:25:13 -04:00
909371d080
SL-18837: Remove 32-bit Windows package entries.
...
glext, which contains only header files, now builds only a single common
package instead of platform-specific ones. But as long as we retain the
platform-specific URLs, autobuild will continue to prefer those over the
common platform. Remove all platform-specific glext package entries.
2023-10-06 11:52:42 -04:00
093b6a1494
SL-18837: Update to Dullahan 1.14.0 with CEF 117
2023-10-06 06:55:34 -04:00
49bbb565b6
Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llpanelemojicomplete.cpp
# indra/newview/skins/default/xui/en/widgets/emoji_complete.xml
2023-10-04 16:56:32 +02:00
0a928bf1fd
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/VIEWER_VERSION.txt
# indra/newview/llagent.cpp
# indra/newview/llfloaternewfeaturenotification.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/llsidepaneltaskinfo.cpp
# indra/newview/llsidepaneltaskinfo.h
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/llviewerinventory.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewertexturelist.h
# indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
2023-10-04 11:38:21 +02:00
ef373cc849
Linux: Update SDL to v2.28.4
2023-10-02 22:35:08 +11:00
d2ec35f19e
Linux: Update curl,openssl and nghttp2 libraries
2023-10-02 22:34:33 +11:00
b8e6777439
SL-18837: Merge branch 'main' into actions
2023-09-07 11:15:56 -04:00
f075bf7599
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# .github/workflows/build_viewer.yml
# indra/newview/llface.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewerregion.cpp
2023-08-31 18:09:40 +02:00
37d04235fe
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-08-30 14:38:51 +02:00
3dddbe6c7d
Update FMOD Studio to 2.02.17 on MacOs
2023-08-28 19:49:53 +01:00
147def0fdb
SL-20130 Update viewer-manager (win64) to build 3.0-83fb46a
2023-08-28 20:40:30 +03:00
dc384d6046
SL-20130 Update viewer-manager to build 3.0-83fb46a
2023-08-28 20:21:11 +03:00
f1c0cd9a2f
Update FMOD Studio to 2.02.17 on Linux
2023-08-29 01:25:31 +10:00
88cc136054
Update FMOD Studio to 2.02.17 on Windows
2023-08-28 16:06:43 +02:00
bcb701af65
How about the checksums too, Beq?
2023-08-28 14:05:17 +01:00
c9575bf8b7
3p KDU for Windows contains both 32 and 64 bit version
2023-08-28 14:55:04 +02:00
635eabcc4c
Update autobuild for KDU-8.3
2023-08-28 13:37:18 +01:00
701cf51cd7
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/llmath/llvolume.cpp
# indra/llrender/llgl.cpp
# indra/llxml/llcontrol.cpp
# indra/newview/llpanelnearbymedia.cpp
# indra/newview/llsceneview.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llstartup.cpp
# indra/newview/lltextureview.cpp
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
2023-08-25 02:57:48 +02:00
4b923d4291
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# .github/workflows/build.yaml
# indra/newview/VIEWER_VERSION.txt
# indra/newview/llappviewer.cpp
# indra/newview/llmeshrepository.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llviewerregion.h
2023-08-24 20:48:55 +02:00
7373fd91fa
Merge remote-tracking branch 'origin/main' into DRTVWR-489
...
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/llmath/llvolume.cpp
# indra/llrender/llgl.cpp
# indra/llxml/llcontrol.cpp
# indra/newview/llpanelnearbymedia.cpp
# indra/newview/llsceneview.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llstartup.cpp
# indra/newview/lltextureview.cpp
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
2023-08-24 01:23:52 +03:00
c6d5f11f63
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-08-23 12:26:14 -07:00
ab000b4dce
SL-16671 Add "Bellisseria" to the viewer dictionary
2023-08-03 01:13:29 +03:00
c704a5fb62
DRTVWR-582 Update llca to build 202305160024.0
2023-08-02 15:00:13 +03:00
5dd820c22d
Merge branch 'DRTVWR-582-maint-U' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/00-Common.cmake
2023-07-29 14:35:11 +02:00
1f615e78b8
SL-20031: Update to viewer-manager 3.0-bd3aec2.
...
This one includes the fix for SL-19756.
2023-07-28 11:04:01 +03:00
f6505f5a40
SL-20031: Update viewer-manager to 3.0-5cfc07c.
...
This version eliminates references to the Windows wmic command, calling the
WMI API instead.
2023-07-28 11:04:01 +03:00
248f78b45e
SL-19854: Update bugsplat to release v1.0.7-527603a.
2023-07-21 10:24:46 -04:00
bbb192eb79
SL-19854: Update bugsplat to release v1.0.7.86a960a.
2023-07-18 16:26:28 -04:00
6f1e7d58e3
SL-18837: Update llphysicsextensions_source to release v1.0.c93156d.
2023-07-14 10:17:13 -04:00
d3c3df624b
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/fsfloaterim.h
2023-07-13 09:22:50 +02:00
497ecef127
Merge branch 'DRTVWR-582-maint-U' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/installers/windows/installer_template.nsi
2023-07-12 11:54:32 +02:00
41a738591e
SL-18837: Update apr_suite to release v1.7.2-e935465.
2023-07-10 13:21:02 -04:00
411aa59734
SL-19756 Update viewer-manager to 3.0.580913
2023-07-07 06:36:15 +03:00
317d4f7b0e
Merge branch 'DRTVWR-582-maint-U' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/cmake/00-Common.cmake
# indra/newview/installers/windows/installer_template.nsi
2023-07-04 14:48:18 +02:00
726851b039
DRTVWR-582: Merge branch DRTVWR-582-maint-U into contribute-frozen
...
to resolve conflicts in installer_template.nsi
2023-06-28 11:02:11 -04:00
70e4fcaf94
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-06-27 12:21:43 +02:00
521dd2ff96
FMOD Studio 2.02.15 update for OSX
2023-06-23 23:23:30 +02:00
156b22f28c
Linux: FMOD Studio update to 2.02.15
2023-06-24 00:35:02 +10:00
c7246d5c22
FMOD Studio update to 2.02.15 for Windows
2023-06-23 13:23:38 +02:00
3ffa57473d
Revert "SL-18837: On Windows, try using py.exe Python stub."
...
This reverts commit 996ea03d87
2023-06-07 14:48:24 -07:00
996ea03d87
SL-18837: On Windows, try using py.exe Python stub.
2023-06-07 09:31:10 -04:00
6503c0b2b8
SL-18837: Update apr_suite to release v1.7.2-4d6fcb2.
2023-06-05 10:53:14 -04:00
659af42ff8
SL-18837: Update apr_suite to release v1.7.2-fb873f5.
2023-06-02 16:05:36 -04:00
1d43352652
SL-18837: Update libxml2, minizip-ng, colladadom
...
Update libxml2 to release v2.9.4.7476681.
Update minizip-ng to release v3.0.2.3e9876e.
Update colladadom to release v2.3.d1ef72a.
2023-06-02 13:18:35 -04:00
aebe458306
Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer
...
# Conflicts:
# README.md
# autobuild.xml
2023-05-31 11:41:09 +02:00
886c608967
DRTVWR-489: Incorporate new 3p libs for Collada and NanoSVG that have both been built after merging with master (and VS 2022 for Collada DOM).
2023-05-30 16:14:45 -07:00
7feba33415
DRTVWR-489: Update NanoSVG build to keep readiness report happier. Remove reference to Linux version of ColladaDOM - out of date, we don't have a newer build and it's making the Readiness Report sad.
2023-05-25 10:33:45 -07:00
b6d4a373a4
DRTVWR-489: Trying to determine why the DRTVWR Readiness Report gets sad about the NanoSVG package - I didn't think it's analysis applied to Linux 3p packages but maybe it does
2023-05-24 11:58:00 -07:00
fbccf6119d
DRTVWR-489: Pull in a new build of 3p-colladadom that has the same version for all 3 platforms/bit widths (580295) - previously, the macOS version was different and the DRTVWR Readiness Script got sad about it
2023-05-23 11:11:13 -07:00
0dfcb8fb53
Updated Havok lib - only 64bit Windows and OSX so far
2023-05-20 00:38:11 +02:00
3ff43893da
SL-18837: Update boost, googlemock
...
Update boost to release v1.81-90bb2df.
Update googlemock to release v1.7.0.77bba00.
2023-05-19 17:08:35 -04:00
ff995bbba4
SL-18837: Next batch of GitHub actions build updates
2023-05-19 15:08:23 -04:00
ce7b2e96d0
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# doc/contributions.txt
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/llinventory/llsettingssky.cpp
# indra/newview/llpathfindingnavmesh.cpp
2023-05-18 12:25:20 +02:00
d927ba575a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/llcommon/llqueuedthread.cpp
# indra/llcommon/llqueuedthread.h
# indra/llcommon/lluuid.cpp
# indra/llcommon/llworkerthread.cpp
# indra/llimage/llimageworker.h
# indra/newview/VIEWER_VERSION.txt
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llfilepicker.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewermenu.cpp
2023-05-17 21:40:54 +02:00
f45e888c90
Some small tweaks after merge with Viewer release
2023-05-17 11:31:45 -07:00
2f44377b3e
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-05-17 11:17:48 -07:00
9057bfc995
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llcallstack.h
# indra/llinventory/llsettingssky.cpp
# indra/llmath/llvolume.cpp
# indra/llwindow/llwindowwin32.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llmeshrepository.cpp
# indra/newview/llmeshrepository.h
# indra/newview/llviewerstats.cpp
# indra/newview/llvoavatar.cpp
2023-05-05 12:35:33 +02:00
7c1ccdc9a4
Merge pull request #179 from secondlife/brad/mac-nightly-builds
...
enable github actions mac nightly builds
2023-05-04 11:49:33 -07:00
52f8ff9961
Merge remote-tracking branch 'origin/SL-19594-restore' into DRTVWR-559
2023-05-04 11:38:52 -07:00
1910eb6ae6
SL-19594: Update to bugsplat build 579669
2023-05-04 09:34:37 -04:00
e41cb7b5db
Further attempts to get actions based nightly mac builds working for DRTVWR-559
2023-05-03 15:23:32 -07:00
5572a4c392
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
2023-05-03 13:11:42 +02:00
2a6c81f1d6
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-05-02 17:52:00 +02:00
11e9d2cdb6
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/featuretable.txt
# indra/newview/featuretable_mac.txt
# indra/newview/llappviewer.cpp
# indra/newview/lldrawpool.cpp
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolbump.cpp
# indra/newview/lldrawpoolmaterials.cpp
# indra/newview/llfeaturemanager.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llfloaterpreferencesgraphicsadvanced.cpp
# indra/newview/llglsandbox.cpp
# indra/newview/llperfstats.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/floater_adjust_environment.xml
# indra/newview/skins/default/xui/en/menu_viewer.xml
# indra/newview/skins/default/xui/en/notifications.xml
# indra/newview/skins/default/xui/en/panel_performance_preferences.xml
# indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
# indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
2023-04-29 23:32:04 +02:00
f5cf0cf876
Update glext package in attempt to fix DRTVWR-559 viewer readiness report errors ( #194 )
2023-04-28 09:46:41 -07:00
ffa21ae649
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-539
...
# Conflicts:
# autobuild.xml
# indra/newview/app_settings/settings.xml
# indra/newview/featuretable_linux.txt
# indra/newview/fsfloaterperformance.cpp
# indra/newview/llappviewer.cpp
# indra/newview/lldrawpool.cpp
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolbump.cpp
# indra/newview/lldrawpoolmaterials.cpp
# indra/newview/llfeaturemanager.cpp
# indra/newview/llperfstats.cpp
# indra/newview/llperfstats.h
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
2023-04-28 00:39:47 +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
8d3e2d1ead
Fix linux build
2023-04-24 12:26:13 +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
719a2d31dc
Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llcommon/CMakeLists.txt
# indra/llui/llscrolllistctrl.h
# indra/newview/CMakeLists.txt
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/skins/default/textures/textures.xml
2023-04-22 12:02:23 +02:00
8ffa65d424
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-04-22 11:54:28 +02:00
34c04a22cf
Add missing build targets
2023-04-22 02:02:59 +02:00
d3dc0e1e27
Add missing build targets
2023-04-22 02:01:37 +02:00
505c01c007
Sync autobuild with upstream
2023-04-22 01:44:13 +02:00
a514fa7b19
Sync autobuild with upstream
2023-04-22 01:43:09 +02:00
45fdf20c3d
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/newview/app_settings/settings.xml
# indra/newview/llviewercontrol.cpp
# indra/newview/pipeline.cpp
2023-04-21 18:32:34 +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
e246e811fa
DRTVWR-489: Pull in SL-19594 Update to Bugsplat that doesn't block on failure to upload PBDs - this means we need to upload symbols for this build to Bugsplat manually if we want meaningful crash reports
2023-04-20 08:47:18 -07:00
4e47e532f8
Merge branch 'SL-19594-fakesmile' into DRTVWR-577-maint-S
2023-04-19 23:15:28 +03:00
3f66bc4904
Merge remote-tracking branch 'origin/SL-19594-fakesmile' into DRTVWR-559
2023-04-19 13:10:47 -07:00
86846ffb8d
SL-19594: Update to bugsplat build 579696
2023-04-19 15:35:47 -04:00
9ffb2514db
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/cmake/00-Common.cmake
# indra/newview/app_settings/settings.xml
# indra/newview/installers/windows/installer_template.nsi
# indra/newview/llviewermenu.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
2023-04-17 10:01:32 +02:00
a6693e9c9e
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# .gitignore
2023-04-16 18:59:53 +02:00
d61d70e19d
Linux: make it build
2023-04-16 18:19:07 +02:00
638a45cbb1
DRTVWR-489: Pull in updated version of BugSplat to work around their change in TLS on 2023-04-11
2023-04-13 15:44:40 -07:00
602d7ea138
SL-19368: update copyright information in Viewer Fonts description that eventually ends up in the Credits panel of Help->About - new 3p viewer fonts package
2023-04-11 14:18:23 -07:00
351faf283a
SL-19078: pull in 3p versions of the emoji/shortcode mapping XML files - 1 for each language that the viewer supports except sadly, Turkish which is not available so far
2023-04-10 16:59:45 -07:00
a0cdaa75a9
SL-18839: Add basic Github build
2023-04-10 16:17:51 -07:00
f1095d7831
Merge branch 'main' into marchcat/main-contrib-merge
...
# Conflicts:
# indra/cmake/CMakeLists.txt
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/llcommon/tests/llleap_test.cpp
# indra/newview/llfilepicker.h
# indra/newview/llfilepicker_mac.h
# indra/newview/llfilepicker_mac.mm
# indra/newview/skins/default/xui/en/strings.xml
2023-04-07 00:20:59 +03:00
6926368ff8
SL-18839: Add basic Github build
2023-04-05 15:44:24 -07:00
256157eba8
Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llcommon/CMakeLists.txt
# indra/newview/CMakeLists.txt
2023-04-05 11:56:57 +02:00
9825c45335
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/ViewerMiscLibs.cmake
# indra/llcommon/CMakeLists.txt
# indra/newview/CMakeLists.txt
2023-04-05 10:56:12 +02:00
68612324b8
DRTVWR-489: pull in a version of 3p-ICU4C from the branch called DRTVWR-489-emoji (identical to VS 2019) but lines up the branches for the otehr 3P packages this work uses
2023-04-03 20:19:07 -07: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
28b240fd7f
DRTVWR-489: Fix things up after a messy merge with main because of a gigantic CMake patch. Sadly, my macOS box updated to Xcode14.3 overnight and that caused many warnings/errors with variables being initialized and then used but not in a way that affected anything.. Building on Xcode 14.3 also requires that MACOSX_DEPLOYMENT_TARGET be set to > 10.13. Waiting on a decision about that but checking this in in the meantime. Builds on macOS with appropriate build variables set for MACOSX_DEPLOYMENT_TARGET = 10.14 but not really expecting this to build in TC because (REDACTED). Windows version probably hopelessly broken - switching to that now.
2023-04-03 14:58:58 -07:00
b1e8f003e6
Linux: Update various 3p libraries
2023-04-02 23:07:44 +10:00
7b9866791a
DRTVWR-489-emoji-PR: Pull in a version of Collada that has std::auto_ptr replaced by std::unique_ptr so it builds on modern mac systems
2023-03-31 16:29:36 -07:00
68e5f326b3
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# .gitignore
# indra/cmake/00-Common.cmake
# indra/cmake/CMakeLists.txt
# indra/cmake/GLEXT.cmake
# indra/cmake/LLCommon.cmake
# indra/cmake/LLMath.cmake
# indra/cmake/LLRender.cmake
# indra/cmake/Tracy.cmake
# indra/llprimitive/CMakeLists.txt
# indra/llrender/llglheaders.h
# indra/llrender/llglslshader.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/llface.cpp
# indra/newview/lltexturefetch.h
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvopartgroup.cpp
# indra/newview/llxmlrpctransaction.cpp
2023-03-31 18:54:16 +02: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
a548c16989
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-03-29 14:54:06 -07: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
c6ce82b0eb
Fix 3p dependencies
2023-03-21 13:25:50 +01:00
b6e9dcc4e8
Merge branch 'DRTVWR-489-emoji-PR' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/newview/llmeshrepository.cpp
2023-03-21 12:21:56 +01:00
ba2477b07d
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-03-21 12:06:02 +01: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
b54c0f4fc1
DRTVWR-489: Pull in updated 3p-freetype package with Kitty's latest changes
2023-03-07 14:47:10 -08: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
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
5bbf10db62
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-02-14 22:03:06 +01: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
1e64098519
Merge branch 'DRTVWR-489-emoji' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/newview/llpathfindingnavmesh.cpp
2023-02-10 01:17:17 +01:00
3079cda486
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/newview/llmeshrepository.cpp
# indra/newview/llvoicevivox.h
2023-02-10 00:50:19 +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
9662c12158
DRTVWR-489-emoji: additional tweaks necessary to get the macOS build into shape
2023-02-08 19:40:24 -08:00
77afc073c5
Merge branch 'xcode-14.1' into DRTVWR-489-emoji
2023-02-08 17:18:37 +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
62b11fc825
Merge branch 'DRTVWR-489-emoji' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llcommon/llqueuedthread.cpp
# indra/llcommon/llsdserialize.h
# indra/llcommon/llthreadsafequeue.h
# indra/llinventory/llsettingssky.cpp
# indra/newview/CMakeLists.txt
# indra/newview/installers/windows/lang_zh.nsi
# indra/newview/llappviewer.cpp
# indra/newview/llnavigationbar.h
# indra/newview/llpathfindingnavmesh.cpp
# indra/newview/lltoolcomp.h
# indra/newview/lltoolfocus.h
# indra/newview/llviewerhelp.h
# indra/newview/llvoicevivox.h
2023-02-04 13:39:11 +01: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
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
7a5381b39f
Merge branch 'main' into DRTVWR-573-maint-R
2023-02-02 21:51:07 +02: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
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
99779d97f1
DRTVWR-489-emoji: Pull in the updated version of GoogleMock that was updated to Python3 so that it builds on macOS in TeamCity
2023-01-26 17:46:56 -08:00
68b59629c4
DRTVWR-489-emoji: Pull in the updated ICU4C package that puts the libs and dlls in the right place for the Windows builds
2023-01-23 17:21:52 -08:00
64e84924d4
DRTVWR-489-emoji: Pull in updated viewer-fonts package that includes 'missing' Tweenmoji SVG font
2023-01-23 12:36:37 -08:00
9e3079f859
Merge branch 'DRTVWR-489-emoji' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llrender/llfontfreetype.cpp
# indra/llrender/llfontregistry.cpp
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llworldmapview.cpp
# indra/newview/skins/default/xui/en/widgets/chat_editor.xml
2023-01-23 16:49:24 +01:00
44a5519fb0
DRTVWR-489-emoji: Pull in an updated version of 3p-icu4c that correctly copies over the Windows DLLs as part of the build process
2023-01-20 17:18:13 -08:00
80bc32c3ef
Pull in (a) version of ICU4C - this one was built with VS 2019 and not VS 2017 like everything else. The work to do this is large and we are switching soon to VS 2022 so this will do for now
2023-01-20 15:17:45 -08:00
7a3ef9e5ac
DRTVWR-489-emoji: following kitty's recipe for emoji viewer - this pulls in 3p library changes for steps 1-5 (boost, colladom, googlemock, nanosvg, viewer-fonts) - final 3p change (ICU4C) coming later
2023-01-19 17:40:16 -08: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
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
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
68c04f41ad
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/viewer_manifest.py
2022-12-19 22:59:03 +01:00
efb96d8c6e
SL-18786 Display updater on the top of other windows
2022-12-14 15:36:24 +02: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
f7838ca17c
Merge branch 'main' into DRTVWR-568
2022-12-12 11:13:10 -08:00
6daa0a9ecb
Merge branch 'main' into DRTVWR-489-emoji
2022-12-12 11:05:24 -08: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
57e8cd490f
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-11-23 10:00:44 +01: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
a849c51837
Pull in latest version of the fonts used in kitty catznip's emoji contribution
2022-11-09 17:28:47 -08:00
40e97353d5
Merge branch 'DRTVWR-489-emoji' of https://bitbucket.org/lindenlab/viewer into DRTVWR-489-emoji
2022-11-09 17:20:07 -08:00
b6066a1b16
Add support for the 3p-nanosvg SVG library that will be used to rfender the emoji glyphs
2022-11-09 17:19:42 -08:00
da8f95ad22
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-11-02 18:06:07 +01: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
b0a3381b2f
SL-18230 - pull in updated 3p-freetype package for macOS/Darwin to build to prevent linker errors in Viewer
2022-10-27 12:46:32 -07:00
b52d54c8ca
SL-18468 - pull in the (new) 3P package containing the Viewer fonts that are required for Kitty's work
2022-10-26 17:30:48 -07:00
12433b11fc
SL-18232 Library changes needed for emoji support from Kitty Barnett (updates for FreeType and ICU4C
2022-10-26 16:10:39 -07:00
30b2b65d70
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-10-26 21:19:41 +02:00
594fb6b084
Merge branch 'DRTVWR-568' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llcommon/CMakeLists.txt
# indra/llwindow/CMakeLists.txt
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/lllegacyatmospherics.cpp
# indra/newview/llmeshrepository.cpp
# indra/newview/llviewertexturelist.cpp
2022-10-25 11:56:30 +02:00
242c8cb5ed
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/llcommon/CMakeLists.txt
# indra/llprimitive/llmodel.cpp
# indra/llwindow/CMakeLists.txt
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/lllegacyatmospherics.cpp
# indra/newview/llmeshrepository.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvopartgroup.cpp
# indra/newview/llworld.cpp
2022-10-25 11:49:36 +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
52ce4adb0c
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
2022-10-19 11:40:51 +02:00
869781cf74
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-10-19 10:29:34 +02:00
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
531d38ba1d
Updated tinygltf package to use common package shared with all platforms as part of SL-17967 work for material overrides
2022-10-14 14:44:05 -07: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
0cdb792d90
SL-18230: PUll in new version of FreeType that turns off zlib requirment to avoid linker dupe errors in the Viewer against zlib
2022-10-06 15:06:06 -07: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
aa6f1ca698
DRTVWR-489: Update to freetype build 575484
2022-10-03 16:37:17 -04: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
0d0d1572b1
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-09-26 15:22:19 +02:00
c3eb62664b
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/app_settings/shaders/class1/deferred/fullbrightShinyV.glsl
# indra/newview/featuretable.txt
# indra/newview/featuretable_mac.txt
# indra/newview/llpanelface.cpp
# indra/newview/llreflectionmapmanager.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
2022-09-26 15:21:07 +02: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
484ccb6946
SL-18187 Resolve Win32 failures due to missing mikktspace
2022-09-21 13:06:31 +03: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
7649114588
Merge branch master (DRTVWR-571) into DRTVWR-559
...
# Conflicts:
# indra/newview/llpanelface.cpp
# indra/newview/llpanelface.h
2022-09-16 21:07:39 +03:00
5a78473123
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
# indra/newview/app_settings/settings.xml
# indra/newview/llpanelface.cpp
# indra/newview/llpanelface.h
# indra/newview/skins/default/xui/en/menu_viewer.xml
2022-09-16 11:23:28 +02: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
8a6ccb65d8
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-09-13 19:14:12 +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
8b1f80c8ce
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
2022-09-08 18:44:46 +02:00
8ad7240a3b
SL-18095 WIP -- Add Mikktspace tangent generation for PBR materials and switch to per-pixel binormal generation. Still bugged with some test content.
2022-09-08 10:06:53 -05:00
323909de61
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-09-03 14:01:37 +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
29cf23c852
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-08-30 09:43:24 +02: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
fb975ad2f1
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-08-10 14:10:21 +02:00
1147d8ee1e
Update fmodstudio
2022-08-07 14:22:52 +02:00
ede1eb93ab
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-08-02 13:55:55 +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
c7ee45846d
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-07-30 17:44:33 +02: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
adfc89c831
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
...
# Conflicts:
# autobuild.xml
# indra/llrender/llgl.cpp
# indra/newview/CMakeLists.txt
# indra/newview/llvovolume.cpp
2022-06-29 23:08:37 +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
069304ca39
Merge branch 'master' (DRTVWR-543) into DRTVWR-559
...
# Conflicts:
# autobuild.xml
# indra/llrender/llgl.cpp
# indra/newview/CMakeLists.txt
# indra/newview/llvovolume.cpp
2022-06-29 21:23:23 +03: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
536e958018
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# autobuild.xml
# indra/newview/CMakeLists.txt
# indra/newview/llface.cpp
# indra/newview/llfilepicker.h
# indra/newview/llinventoryicon.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llvovolume.h
# indra/newview/pipeline.cpp
# indra/newview/skins/default/textures/textures.xml
# indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
2022-06-27 17:58:22 +02:00
a6774ca4dd
Fixed DRTVWR-559 mac build with new glext package that includes KHR/khrplatform.h
2022-06-24 02:56:30 -07:00
6b85705951
fixing DRTVWR-559 glext usage on mac by upgrading to use khronos distributed glext.h
2022-06-23 22:53:36 -07:00
31e2fa5e50
SL-17600 WIP -- Proper radiance maps (not just mipped cubemaps).
2022-06-21 22:44:30 -05:00
8e4abf8ea3
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
2022-06-10 13:52:52 +02:00
87c38379e1
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
2022-06-10 12:32:42 +02:00
d1dc9c35a9
tinygltf also updated mac and 32bit windows packages with new public build for SL-17214
2022-06-09 10:06:21 -07:00
5b76111b27
tinygltf updated with new public build for SL-17214
2022-06-09 10:02:49 -07:00
2dc376aa53
SL-17214 add 3p-tinygltf dependency to autobuild.xml
2022-06-08 13:33:59 -06: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
3765c775cb
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
2022-05-21 15:04:54 +02:00
14e3104f86
SL-17452 Fixed anscii usage dullahan side
2022-05-21 01:11:38 +03:00
6c6d9a10f8
SL-17287 Update Tracy to 0.8.1. Clean up GPU instrumentation.
2022-05-20 13:31:18 -05:00
3400e5fd30
SL-17284 Reflection probe tuning and optimization take 1
2022-05-16 17:21:08 +00: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
201f83472c
Merge branch 'master' into DRTVWR-543-maint
2022-02-28 21:55:28 +02:00
73eec89131
Merge branch 'master' into DRTVWR-540-maint
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llsys.cpp
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llfloatereditextdaycycle.cpp
2022-02-28 21:54:21 +02:00
0aa59b2bee
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-02-22 13:40:40 +01:00
0bd3e3d53a
Merge branch 'linux_crashlogger'
2022-02-21 08:14:04 +01:00
7dd7abf396
Bring back gstreamer, remove the old and unmaintained Linux VLC version.
2022-02-20 21:24:37 +01:00
2db46702c4
Linux; Update curl
2022-02-20 20:46:18 +01:00
Pork Chop