85f2447b3d
Merge branch 'main' into marchcat/a-merge
...
# Conflicts:
# autobuild.xml
# indra/llimage/llimage.cpp
# indra/llui/llsearcheditor.cpp
# indra/llui/llview.cpp
# indra/newview/llagent.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloatercamera.cpp
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llinventoryfunctions.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpanelgroupbulkban.cpp
# indra/newview/llsidepanelappearance.cpp
# indra/newview/llvovolume.cpp
2024-04-24 19:28:15 +03:00
d0102af56d
Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A
...
# Conflicts:
# indra/llcommon/llapp.cpp
# indra/llcommon/llapp.h
# indra/llimage/llimageworker.cpp
# indra/llui/llcontainerview.cpp
# indra/llui/llcontainerview.h
# indra/llui/llkeywords.cpp
# indra/llui/lltabcontainer.cpp
# indra/llui/lltextbase.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfavoritesbar.cpp
# indra/newview/llfavoritesbar.h
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llhudnametag.h
# indra/newview/llinventorypanel.cpp
# indra/newview/llinventorypanel.h
# indra/newview/llmeshrepository.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llpanelprofilepicks.cpp
# indra/newview/llpanelvoicedevicesettings.h
# indra/newview/llpreviewscript.cpp
# indra/newview/llpreviewscript.h
# indra/newview/llselectmgr.cpp
# indra/newview/lltranslate.cpp
# indra/newview/llviewerassetupload.cpp
# indra/newview/llviewermessage.cpp
2024-04-11 21:59:38 +02:00
17e1f3692c
Port from JsonCPP to Boost.Json for json parsing and serializing ( #1054 )
2024-04-06 02:03:58 +03:00
d9f7cd36a7
Switch to 3p-boost repo built libs
2024-04-01 10:28:17 +03:00
cf45bf5f6e
Add boost 1.84.0, boost.json
...
Update boost from 1.81.0 (2022) to 1.84.0 (2023) and enable the
`boost.json` module so that it can replace rapidjson.
2024-04-01 10:28:17 +03:00
53d4fcd359
Remove dead googlemock dependency and related setup code
2024-03-28 19:41:47 +02:00
32c24ffbd7
Fix merge issues
2024-03-27 15:48:33 +02:00
990c8b81da
Merge branch 'main' into marchcat/yz-merge
2024-03-27 01:40:12 +02:00
71ed19839e
Merge branch 'main' into DRTVWR-600-maint-A
...
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterchangeitemthumbnail.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llvovolume.cpp
2024-03-27 00:45:06 +02:00
78174fc865
Merge remote-tracking branch 'origin/main' into DRTVWR-588-maint-W
...
# Conflicts:
# .github/workflows/build.yaml
2024-03-27 00:14:56 +02:00
eb1ed3896f
Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A
...
# Conflicts:
# autobuild.xml
# indra/llrender/llfontbitmapcache.cpp
# indra/llrender/llfontbitmapcache.h
# indra/llrender/llfontfreetype.cpp
# indra/llrender/llfontfreetype.h
# indra/llrender/llfontgl.cpp
# indra/llrender/llfontgl.h
# indra/llui/llbutton.h
# indra/llui/llfloater.cpp
# indra/llui/llfloater.h
# indra/llui/llfolderviewitem.cpp
# indra/llui/lllineeditor.cpp
# indra/llui/lllineeditor.h
# indra/llui/llscrollcontainer.cpp
# indra/llui/llscrollingpanellist.cpp
# indra/llui/llscrollingpanellist.h
# indra/llui/llscrolllistctrl.h
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltexteditor.h
# indra/llui/lluictrl.cpp
# indra/llui/llview.cpp
# indra/llui/llview.h
# indra/newview/llchicletbar.h
# indra/newview/llconversationlog.h
# indra/newview/llfloaterimsessiontab.cpp
# indra/newview/llfloaterimsessiontab.h
# indra/newview/llfloateruipreview.cpp
# indra/newview/llnavigationbar.h
# indra/newview/llpaneltopinfobar.h
# indra/newview/llpathfindingpathtool.h
# indra/newview/lltextureview.cpp
# indra/newview/lltoolbrush.h
# indra/newview/lltoolcomp.h
# indra/newview/lltooldraganddrop.h
# indra/newview/lltoolface.h
# indra/newview/lltoolfocus.h
# indra/newview/lltoolindividual.h
# indra/newview/lltoolobjpicker.h
# indra/newview/lltoolpie.h
# indra/newview/lltoolpipette.h
# indra/newview/lltoolselectland.h
# indra/newview/llviewermediafocus.h
# indra/newview/llviewerparcelmediaautoplay.h
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoicechannel.h
# indra/newview/llvoicevivox.h
# indra/newview/llworldmapview.cpp
2024-03-12 16:52:30 +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
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
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
0752cc0792
DRTVWR-601: Merge branch 'release/gltf-maint2' into DRTVWR-601-gha-libs
2024-01-19 11:38:02 -05:00
0fa6ff2b1f
Undo re-ordering of autobuild.xml ( #638 )
2024-01-16 11:08:39 -06:00
fab4cfbab2
SL-20704 Fix for pathfinding debug display not working.
2024-01-10 13:50:15 -06: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
aed6313d7c
Merge branch 'main' into DRTVWR-594-maint-Y
2023-12-18 06:33:57 +02: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
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
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
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
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
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
2f735f6909
SL-20591 Update viewer-manager to v3.0.73fef89
2023-11-17 02:33:53 +02:00
96f7f708c1
SL-20591 Update viewer-manager to v3.0.0395b15
2023-11-10 01:57:27 +02:00
9b6a90eedd
Revert "SL-20185 Fix connection issues ( #490 )"
...
Issue reproed again, restoring.
2023-11-06 20:41:01 +02:00
6aa4a267a7
SL-20185 Fix connection issues ( #490 )
2023-11-03 00:10:50 +02:00
54bfff622d
DRTVWR-594 Update LLCA to v202311020117.0-0f5d9c3
2023-11-02 01:23:33 +02: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
673b3309dd
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-10-25 16:12:13 -07:00
Andrey Lihatskiy