7f038e68e7
Linux: Fix build after recent merge
2024-03-03 00:10:32 +11:00
799c2c6dab
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/newview/llinventorygallery.cpp
# indra/newview/skins/default/xui/de/menu_viewer.xml
2024-03-02 00:42:18 +01:00
2827ebf04f
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-03-01 22:47:21 +01:00
203ac04bf6
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/newview/skins/default/xui/en/floater_stats.xml
2024-03-01 20:49:42 +01:00
258c039584
Merge remote-tracking branch 'origin/main' into release/gltf-maint2
2024-03-01 10:12:00 -08:00
faf69f407f
Merge branch 'main' into marchcat/yz-merge
...
# Conflicts:
# indra/newview/llinventorygallery.cpp
2024-03-01 18:02:48 +02:00
6d077c90a0
Merge branch 'main' into DRTVWR-588-maint-W
2024-03-01 17:30:06 +02:00
474cbf62cf
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-02-14 18:04:46 +01:00
bc6a69ac66
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-02-11 18:37:21 +01:00
762855f255
SL-19585 Try replacing fmod with openal
...
Since now VLC is responsible for played parcel media (should be since
SL-19042) should be possible to switch remaining audio to OpenAL with
no loss of functionality
2024-02-09 01:31:50 +02:00
6248b77457
Update FMOD Studio 2.02.20 for Linux and MacOS
2024-02-08 16:21:41 +00:00
bce7069a32
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-02-08 15:01:40 +01:00
4ce6b5114d
Update FMOD Studio to 2.02.20 for Windows
2024-02-07 18:10:16 +01:00
c6356da181
Merge branch 'release/maint-yz' of https://github.com/secondlife/viewer
...
# Conflicts:
# README.md
# autobuild.xml
# indra/newview/llchiclet.h
2024-02-05 23:45:27 +01:00
80579b7574
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-599
...
# Conflicts:
# indra/newview/llchiclet.h
2024-02-05 23:32:19 +01:00
ea916ad950
DRTVWR-594 Update llca to version 202402012004.0
2024-02-02 00:23:36 +02:00
39aefc63d1
Issue #716 Update Fmod Studio to version 2.02.20
2024-02-01 21:56:26 +02:00
11207d7985
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master
2024-01-26 13:19:06 +01:00
fa05f94eae
Merge branch 'release/gltf-maint2' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/newview/app_settings/settings.xml
2024-01-23 12:23:54 +01:00
0752cc0792
DRTVWR-601: Merge branch 'release/gltf-maint2' into DRTVWR-601-gha-libs
2024-01-19 11:38:02 -05:00
c7a44ac88b
Merge branch 'DRTVWR-601' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/lltexturectrl.h
2024-01-17 11:04:36 +01:00
0fa6ff2b1f
Undo re-ordering of autobuild.xml ( #638 )
2024-01-16 11:08:39 -06:00
b592795c0b
Updated Havok lib with the presumed navmesh fix
2024-01-12 18:15:04 +01:00
fab4cfbab2
SL-20704 Fix for pathfinding debug display not working.
2024-01-10 13:50:15 -06:00
709aaaf0b0
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master
...
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
2024-01-09 11:58:47 +01:00
b9a2c8279f
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master
...
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
2024-01-09 10:54:50 +01:00
6208041d15
Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer
2024-01-09 10:21:36 +01:00
3bd76c0fea
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master
...
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
# indra/newview/llfasttimerview.cpp
# indra/newview/skins/default/xui/en/widgets/color_swatch.xml
# indra/newview/skins/default/xui/en/widgets/texture_picker.xml
2024-01-09 09:37:38 +01:00
6e6df8c31e
SL-20747 Fix pshell command failing in some cases
2024-01-08 19:27:58 +02:00
a8f43fd40b
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-01-05 13:17:23 +01:00
0e154e344e
It's 2024... basically... almost...
2023-12-31 14:06:25 +01:00
e341621a8e
Merge branch 'DRTVWR-594-maint-Y' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llmemory.cpp
# indra/llui/lltooltip.cpp
# indra/newview/llagent.cpp
# indra/newview/llpanelteleporthistory.cpp
# indra/newview/skins/default/xui/en/menu_inventory.xml
# indra/newview/skins/default/xui/en/notifications.xml
2023-12-27 13:00:20 +01:00
bc3076938e
DRTVWR-601: Update xxhash common platform to GHA build.
...
Remove identical platform-specific package references.
2023-12-20 12:50:34 -05:00
6f4dcd58b7
DRTVWR-601: Update mikktspace, tinygltf, tracy, vulkan_gltf, xxhash
...
to latest GitHub builds. Some of these were still referencing codeticket
builds produced by TeamCity.
2023-12-18 14:47:03 -05:00
0b556ef3b9
Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer
...
# Conflicts:
# .github/release.yaml
# autobuild.xml
# indra/newview/llviewermenu.cpp
2023-12-18 20:45:20 +01:00
b32cd27b4c
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
...
# Conflicts:
# autobuild.xml
# indra/cmake/ViewerMiscLibs.cmake
# indra/llmath/llvolume.cpp
# indra/newview/fonts/DejaVu-license.txt
# indra/newview/fonts/DejaVuSans-Bold.ttf
# indra/newview/fonts/DejaVuSans-BoldOblique.ttf
# indra/newview/fonts/DejaVuSans-Oblique.ttf
# indra/newview/fonts/DejaVuSans.ttf
# indra/newview/fonts/DejaVuSansMono.ttf
# indra/newview/llviewermenu.cpp
2023-12-18 19:25:49 +01:00
aed6313d7c
Merge branch 'main' into DRTVWR-594-maint-Y
2023-12-18 06:33:57 +02:00
783e488a63
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
...
# Conflicts:
# indra/newview/llfloaterimcontainer.cpp
# indra/newview/llspatialpartition.cpp
2023-12-15 22:48:56 +01:00
67da0c7f60
DRTVWR-601: Update vulkan_gltf to GHA build.
2023-12-15 16:23:49 -05:00
d07cd115e3
DRTVWR-601: Drop 32-bit Windows build of llphysicsextension_stub.
2023-12-15 16:14:38 -05:00
1df31d64e8
DRTVWR-601: Update mikktspace and tinygltf to GHA package builds.
...
Ditch 32-bit Windows build of mikktspace.
2023-12-15 16:13:51 -05:00
e3c2f12d53
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
...
# Conflicts:
# indra/newview/skins/default/xui/da/panel_main_inventory.xml
# indra/newview/skins/default/xui/pt/panel_main_inventory.xml
# indra/newview/skins/default/xui/tr/panel_main_inventory.xml
# indra/newview/skins/default/xui/zh/panel_main_inventory.xml
2023-12-15 18:25:32 +01:00
881eb4fd02
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-12-15 18:23:24 +01:00
793bed7d06
Merge branch 'main' into DRTVWR-489
...
# Conflicts:
# indra/newview/fonts/DejaVu-license.txt
# indra/newview/fonts/DejaVuSans-Bold.ttf
# indra/newview/fonts/DejaVuSans-BoldOblique.ttf
# indra/newview/fonts/DejaVuSans-Oblique.ttf
# indra/newview/fonts/DejaVuSans.ttf
# indra/newview/fonts/DejaVuSansMono.ttf
2023-12-15 07:06:15 +02:00
f05fa29db1
Linux: Update libndofdev 0.13 -> 0.14. Update SDL2 to latest stable release (2.28.5)
2023-12-14 14:26:56 +11:00
4b98ae6e8a
Merge branch 'DRTVWR-587-maint-V' into DRTVWR-588-maint-W
...
# Conflicts:
# indra/newview/llspatialpartition.cpp
2023-12-14 02:47:44 +02:00
bdcd99861c
Linux: replace cubemaptoequirectangular with a version that actually has CubemapToEquirectangular.js in it...
2023-12-13 21:49:00 +11:00
88921452ad
DRTVWR-489 Restore autobuild.xml format
2023-12-13 06:26:06 +02:00
5b789e05f5
DRTVWR-489 Update freetype to v.2.12.1.557becd
2023-12-12 19:02:54 +02:00
7f8931fd96
Merge branch 'DRTVWR-588-maint-W' of https://github.com/secondlife/viewer
...
# Conflicts:
# .github/release.yaml
# autobuild.xml
# indra/newview/llscrollingpanelparam.cpp
2023-12-12 12:57:27 +01:00
eff5958c11
Fix formatting in autobuild.xml (indents in close tags)
2023-12-05 20:37:21 +01:00
86a437d96c
DRTVWR-587 Update llca to version 202312051404.0
2023-12-05 18:40:08 +02:00
07ace73c49
DRTVWR-587 Update llca to version 202312051404.0
2023-12-05 16:17:04 +02:00
c9cd5631e4
Merge branch 'main' into DRTVWR-489
2023-12-05 03:37:06 +01:00
50c7296d34
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
...
# Conflicts:
# indra/llcommon/CMakeLists.txt
# indra/newview/llspatialpartition.cpp
# indra/newview/llvoavatar.cpp
2023-12-01 11:27:42 +01:00
cfd9c49647
Merge branch 'DRTVWR-587-maint-V' of H:/ViewerDev/viewer-587
...
# Conflicts:
# .gitignore
2023-11-30 18:44:01 +01:00
c87063987c
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-11-30 18:41:42 +01:00
c409236dac
Merge branch 'DRTVWR-594-maint-Y' into marchcat/594-y-pbr-merge
...
# Conflicts:
# indra/newview/llinventorygallery.cpp
# indra/newview/skins/default/xui/en/notifications.xml
2023-11-30 18:09:29 +02:00
d1c0a5b840
Merge branch 'DRTVWR-559' into marchcat/587-v-pbr-merge
...
# Conflicts:
# indra/llcommon/CMakeLists.txt
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewergenericmessage.cpp
# indra/newview/llvoavatar.cpp
2023-11-29 10:45:43 +02:00
974a2a1d40
DRTVWR-587: Update to viewer-manager v3.0-08bf5ee.
...
This viewer-manager refactors the bad-graphics-card detection.
2023-11-22 14:12:46 -05:00
faadebbb69
DRTVWR-594: Update kdu version from the updated package.
2023-11-22 10:25:06 -05:00
fe30ed1b49
DRTVWR-594: Update havok-source with havok-libs per recent PR.
2023-11-21 17:02:52 -05:00
8e3253dc1a
DRTVWR-594: Update kdu per recent PR
2023-11-21 16:36:13 -05:00
426cf29278
DRTVWR-594: Update dictionaries, glh_linear, havok-source
...
per recent PRs. Actually the havok-source update is for a new havok-llvm build.
2023-11-21 15:34:26 -05:00
a963ba296e
SL-20591 Update viewer-manager to v3.0.0170afb
...
Restored removed commits since issue was isolated and bypassed.
Original issue: win32util.py imports wmi, if import fails it uses
registry for getting dns, if import works, it uses wmi to get dns.
Including wmi broke dns for some of the users ([Errno 11001] Name or
service not known)
2023-11-21 19:33:54 +02:00
be71515833
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-11-20 13:05:09 +01:00
b3276e50b1
Update KDU to 8.4.1 for all platforms.
2023-11-18 02:23:58 +00:00
2f735f6909
SL-20591 Update viewer-manager to v3.0.73fef89
2023-11-17 02:33:53 +02:00
a7e68395b2
Merge branch 'DRTVWR-587-maint-V' of https://github.com/secondlife/viewer
2023-11-15 11:34:13 +01:00
198bd5cfc0
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/lldrawable.cpp
2023-11-15 11:33:41 +01:00
3eeddf0a55
Clean up any stragglers using the old phoenixviewer domain for 3p libraries (seemed to be just gstreamer for linux), change URL's to use HTTPS where supported instead of plain old HTTP
2023-11-12 11:04:20 +11:00
96f7f708c1
SL-20591 Update viewer-manager to v3.0.0395b15
2023-11-10 01:57:27 +02:00
aa847c1bac
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-11-07 10:23:48 +01:00
9b6a90eedd
Revert "SL-20185 Fix connection issues ( #490 )"
...
Issue reproed again, restoring.
2023-11-06 20:41:01 +02:00
5827e92a9a
Linux: Update dullahan again (use-gl=desktop was messing things up), the default in CEF seems to now be to use the Angle compatibility layer to figure out what works. Some corrections to the viewer manifest file, the EGL/GLES libraries (which Angle needs) now reside in a different folder with recent CEF builds, so update accordingly. Moved CEF locales from bin -> lib folder as CEF was complaining about not being able to find its locales
2023-11-06 19:00:16 +11:00
835305e9d8
Linux: dullahan+cef update to 1.14/118.0.5993.117
2023-11-05 13:20:47 +11:00
6aa4a267a7
SL-20185 Fix connection issues ( #490 )
2023-11-03 00:10:50 +02:00
f47a2bddaa
Ditch Github credentials requirements for our private libs
2023-11-02 21:56:05 +01:00
698168efbe
Linux: Remove conflicting xmlrpc_epi package and revert back to a working one
2023-11-02 14:30:48 +11:00
aa440ccd28
Linux: Remove conflicting xmlrpc_epi package and revert back to a working one
2023-11-02 14:06:54 +11:00
54bfff622d
DRTVWR-594 Update LLCA to v202311020117.0-0f5d9c3
2023-11-02 01:23:33 +02:00
34d2a78898
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/llviewergenericmessage.cpp
2023-11-01 13:44:17 +01:00
66ae2434bc
DRTVWR-587: Update viewer-manager to v3.0-074736e.
...
This is viewer-manager's DRTVWR-587-actions branch updated from the new master
branch.
2023-10-31 13:40:07 -04:00
b5c7c6b078
SL-20031: Reintroduce newest viewer-manager build.
2023-10-31 11:04:41 -04:00
b64793e2b0
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-10-27 16:24:33 +02:00
6c389316f1
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llerror.cpp
# indra/llrender/llrender.h
# indra/newview/VIEWER_VERSION.txt
2023-10-27 13:00:41 +02:00
70db255e02
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
...
# Conflicts:
# .github/workflows/build.yaml
# autobuild.xml
# indra/llcommon/llerror.cpp
# indra/llcommon/tests/workqueue_test.cpp
# indra/newview/VIEWER_VERSION.txt
2023-10-27 11:52:59 +02:00
a7578e9690
Update autobuild for Mac fmodstudio 2.02.18
...
GHA builds already have this, this change keeps the autobuild in step
2023-10-27 10:03:43 +01:00
5f9fb4a395
Merge branch 'DRTVWR-587-maint-V' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/newview/CMakeLists.txt
# indra/newview/installers/darwin/release-dmg/_VolumeIcon.icns
# indra/newview/installers/darwin/release-dmg/background.jpg
# scripts/messages/message_template.msg.sha1
2023-10-26 21:25:27 +02:00
39a6735fc9
Merge branch 'main' of https://github.com/secondlife/viewer
...
# Conflicts:
# .gitignore
# autobuild.xml
# indra/cmake/APR.cmake
# indra/newview/CMakeLists.txt
# indra/newview/installers/windows/installer_template.nsi
# indra/newview/viewer_manifest.py
# indra/test/namedtempfile.h
2023-10-26 15:49:12 +02:00
673b3309dd
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-10-25 16:12:13 -07:00
4c6ae49c88
Merge branch 'main' into DRTVWR-587-maint-V
...
# Conflicts:
# autobuild.xml
# indra/llcommon/tests/llleap_test.cpp
# indra/newview/viewer_manifest.py
2023-10-25 21:28:26 +03:00
56911455e0
SL-18837: Update dullahan to v118.0.5993.54
...
This includes this week's CEF 118.
2023-10-13 09:32:53 -04:00
be5a6e6179
SL-18837: Update openal to v1.23.1-18e315c
2023-10-12 13:32:50 -04:00
787ca67b5f
SL-18837: Update llca to v202310121525.0-d22bd98
2023-10-12 11:32:25 -04:00
eeeeefadb7
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-10-11 11:25:27 +02:00
067f3790da
SL-18943 Update LLCA to 202310110702.0
2023-10-11 10:27:39 +03:00
660a9a3385
SL-18943 Update LLCA to 202310110655.0
2023-10-11 09:57:57 +03:00
9415d45848
DRTVWR-587 Update viewer-manager to 3.0-f48e635
2023-10-10 22:51:16 +03:00
bff2f43009
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-10-09 10:38:46 +02:00
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
Pork Chop