f08b3f2046
Update to libhunspell 1.7.2-r1 ( #2175 )
2024-08-02 13:31:11 +03:00
05fd13f896
Remove dead pcre library dependency ( #2177 )
2024-08-02 13:29:28 +03:00
68ad61f6f5
Update from jpeglib to libjpeg-turbo 3.0.3 ( #2161 , #2173 )
2024-08-02 13:25:39 +03:00
d3ba6ca08c
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-atlasaurus
2024-08-02 12:04:58 +02:00
b0a053d447
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-webrtc-voice
2024-08-02 12:00:46 +02:00
fa4ad236fc
Merge branch 'release/webrtc-voice' of https://github.com/secondlife/viewer
2024-08-02 11:59:06 +02:00
0ff2bd1a40
Merge remote-tracking branch 'origin/release/2024.06-atlasaurus' into develop
2024-08-01 15:42:22 -07:00
002be0f243
Merge remote-tracking branch 'origin/release/webrtc-voice' into release/2024.06-atlasaurus
2024-08-01 15:40:41 -07:00
b9c222dfae
Implement a Logging Sink for WebRTC
...
WebRTC logs now pass out of the webrtc library into a logging sink,
which converts them into SecondLife.log compatable logging calls.
This includes fatal errors and asserts, which are now logged into
SecondLife.log, and should be available in the crash logger.
2024-07-31 21:23:30 -06:00
2582e4a47a
Use new webrtc lib with crash-on-fatal support
2024-07-30 16:53:46 -06:00
02680c6a8f
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/Boost.cmake
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llaudio/llaudiodecodemgr.cpp
# indra/llxml/llxmltree.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llfloaterworldmap.h
# indra/newview/llgesturemgr.cpp
# indra/newview/llinventorygallerymenu.cpp
# indra/newview/llpanelgroup.cpp
# indra/newview/llpanelgroup.h
# indra/newview/llpanelprofile.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/viewer_manifest.py
2024-07-30 12:32:41 +02:00
3e322df4fb
Replace liburiparser with boost::url
2024-07-29 13:33:12 +03:00
c7c7342ed3
Update boost to 1.85 and fix deprecation warnings
2024-07-29 08:20:32 +03:00
e17c906698
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/newview/llcontrolavatar.cpp
# indra/newview/lldrawpoolterrain.cpp
# indra/newview/llmeshrepository.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoavatar.cpp
2024-07-22 20:58:53 +02:00
75fb5c0d5e
Update llca to 202407221423.0 ( #2084 )
2024-07-22 17:41:51 +03:00
cf5bc75d44
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-webrtc-voice
...
# Conflicts:
# indra/newview/llpanelsnapshot.cpp
# indra/newview/llsnapshotlivepreview.cpp
# indra/newview/llspeakers.cpp
# indra/newview/llvoicechannel.cpp
# indra/newview/rlvinventory.cpp
2024-07-18 21:53:13 +02:00
f04ed0e5e4
Merge branch 'release/webrtc-voice' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/newview/llspeakers.cpp
# indra/newview/llvocache.cpp
# indra/newview/llvoiceclient.cpp
# indra/newview/skins/default/xui/de/menu_viewer.xml
# indra/newview/skins/default/xui/en/panel_preferences_sound.xml
# indra/newview/skins/default/xui/es/menu_viewer.xml
# indra/newview/skins/default/xui/it/menu_viewer.xml
# indra/newview/skins/default/xui/ja/menu_viewer.xml
# indra/newview/skins/default/xui/pl/menu_viewer.xml
# indra/newview/skins/default/xui/pt/menu_viewer.xml
# indra/newview/skins/default/xui/ru/menu_viewer.xml
# indra/newview/skins/default/xui/tr/menu_viewer.xml
# indra/newview/skins/default/xui/zh/menu_viewer.xml
2024-07-18 20:27:40 +02:00
ebc0482bc0
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-07-18 20:14:24 +02:00
0a83a1e6b7
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/newview/llagentbenefits.cpp
# indra/newview/llagentbenefits.h
# indra/newview/llfloatersidepanelcontainer.h
# indra/newview/llfloatersnapshot.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llpanelsnapshot.cpp
# indra/newview/llpanelsnapshotinventory.cpp
# indra/newview/llpanelsnapshotoptions.cpp
# indra/newview/llpreviewscript.cpp
# indra/newview/llsnapshotlivepreview.cpp
2024-07-18 20:04:45 +02:00
3e4b23539c
Merge remote-tracking branch 'origin/release/webrtc-voice' into release/2024.06-atlasaurus
...
# Conflicts:
# autobuild.xml
# indra/newview/llvoicechannel.cpp
2024-07-17 14:35:17 -07:00
b054f8db0c
Merge remote-tracking branch 'origin/release/webrtc-voice' into develop
...
# Conflicts:
# autobuild.xml
2024-07-17 14:31:09 -07:00
76f2b1f48c
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llfloaterspellchecksettings.h
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexture.h
2024-07-16 10:44:38 +02:00
223114f63d
Update llphysicsextensions_source to v1.0.66e6919 ( #1985 )
2024-07-11 09:17:02 +03:00
68514ab97f
Remove duplicate entry in autobuild.xml
2024-07-10 12:39:43 +02:00
cb43c1c792
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llprofiler.h
# indra/llcommon/llthread.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterpreferencesgraphicsadvanced.cpp
2024-07-10 12:36:15 +02:00
99396c859d
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.cpp
2024-07-10 10:31:35 +02:00
f8b1d8095e
Update meshoptimizer package to 0.21 ( #1948 )
2024-07-09 19:51:38 -05:00
2a7030992f
Update tracy profiler to 0.10 ( #1946 )
2024-07-09 16:53:43 -05:00
d1b1bb12cb
Sync autobuild.xml up with release autobuild.
2024-07-03 11:26:39 -07:00
9a2b83b294
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llmemory.cpp
# indra/llmessage/CMakeLists.txt
# indra/llmessage/llfiltersd2xmlrpc.cpp
# indra/newview/lldebugview.cpp
# indra/newview/lldrawpoolbump.cpp
# indra/newview/llheroprobemanager.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llslurl.cpp
# indra/newview/llsurface.cpp
# indra/newview/lltextureview.cpp
# indra/newview/llversioninfo.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.h
# indra/newview/llviewerwindow.cpp
# indra/newview/llvlcomposition.cpp
# indra/newview/llvoiceclient.cpp
# indra/newview/llworld.cpp
# indra/newview/llxmlrpctransaction.cpp
# indra/newview/skins/default/xui/da/floater_about.xml
# indra/newview/skins/default/xui/de/floater_about.xml
# indra/newview/skins/default/xui/de/menu_viewer.xml
# indra/newview/skins/default/xui/en/floater_about.xml
# indra/newview/skins/default/xui/es/floater_about.xml
# indra/newview/skins/default/xui/es/menu_viewer.xml
# indra/newview/skins/default/xui/fr/floater_about.xml
# indra/newview/skins/default/xui/it/floater_about.xml
# indra/newview/skins/default/xui/it/menu_viewer.xml
# indra/newview/skins/default/xui/ja/menu_viewer.xml
# indra/newview/skins/default/xui/pl/menu_viewer.xml
# indra/newview/skins/default/xui/pt/floater_about.xml
# indra/newview/skins/default/xui/pt/menu_viewer.xml
# indra/newview/skins/default/xui/ru/floater_about.xml
# indra/newview/skins/default/xui/ru/menu_viewer.xml
# indra/newview/skins/default/xui/tr/floater_about.xml
# indra/newview/skins/default/xui/tr/menu_viewer.xml
# indra/newview/skins/default/xui/zh/floater_about.xml
# indra/newview/skins/default/xui/zh/menu_viewer.xml
# scripts/messages/message_template.msg.sha1
2024-07-02 18:08:57 +02:00
20294e9ee8
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.cpp
2024-07-02 01:23:35 +02:00
795f421e0e
More work on Tracy support
2024-07-01 21:04:06 +01:00
2ea5ac0c43
#1111 Remove xmlrpc-epi
2024-07-01 20:20:04 +02:00
610dc70347
Tracy - include backtrace support required by Linux and Mac
2024-07-01 18:45:54 +01:00
7c519ee4d5
Tracy builds for Mac and Linux, maybe.
2024-07-01 14:54:03 +01:00
684bc1d1ea
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/00-Common.cmake
# indra/llcommon/llsys.cpp
# indra/llwindow/llwindow.cpp
# indra/llwindow/llwindow.h
# indra/llwindow/llwindowmacosx.cpp
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/logcontrol.xml
# indra/newview/llappviewerwin32.cpp
# indra/newview/llpanelpeople.h
# indra/newview/llspeakers.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvocache.cpp
# indra/newview/llvoicechannel.cpp
# indra/newview/llvoicechannel.h
# indra/newview/llvoiceclient.h
# indra/newview/llvoicevivox.cpp
# indra/newview/skins/default/xui/en/panel_preferences_sound.xml
# indra/newview/viewer_manifest.py
# scripts/messages/message_template.msg.sha1
2024-06-21 19:46:51 +02:00
e33d2fad5f
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-gltf-development
...
# Conflicts:
# indra/newview/llimview.h
# indra/newview/llpanelpeople.h
# indra/newview/llpanelvoicedevicesettings.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvoicechannel.cpp
# indra/newview/llvoicechannel.h
# indra/newview/llvoiceclient.cpp
# indra/newview/llvoiceclient.h
# indra/newview/llvoicevivox.cpp
# indra/newview/llvoicevivox.h
2024-06-21 19:10:44 +02:00
e4fd1bd71e
viewer#1808 Use bugsplat's setAttribute for app state
2024-06-21 11:46:25 +03:00
c686be5b0d
Merge remote-tracking branch 'origin/release/webrtc-voice' into brad/webrtc-voice-develop
2024-06-20 14:29:46 -07:00
0799f799e6
Fix crash issue when echo cancellation is enabled/disabled.
...
New webrtc library fixes an assert in webrtc when echo cancellation is enabled or
disabled.
Also, fix an issue where disabling media grays out noise cancellation.
2024-06-18 15:40:12 -07:00
5e60392c27
Merge branch 'develop' of github.com:secondlife/viewer into roxie/webrtc-voice
2024-06-13 14:59:28 -07:00
c29a661b22
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-600
...
# Conflicts:
# indra/llimage/llimage.cpp
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llglslshader.cpp
# indra/newview/app_settings/shaders/class1/deferred/pbrterrainF.glsl
# indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl
# indra/newview/app_settings/shaders/class2/deferred/pbralphaF.glsl
# indra/newview/gltf/accessor.cpp
# indra/newview/gltf/accessor.h
# indra/newview/gltf/animation.h
# indra/newview/gltf/asset.cpp
# indra/newview/gltf/primitive.cpp
# indra/newview/gltf/primitive.h
# indra/newview/gltfscenemanager.h
# indra/newview/llenvironment.cpp
# indra/newview/llfetchedgltfmaterial.cpp
# indra/newview/llfloaterregioninfo.h
# indra/newview/llimprocessing.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltinygltfhelper.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llvlcomposition.cpp
# indra/newview/llvlcomposition.h
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
2024-06-13 01:54:18 +02:00
8565041c2d
Merge branch 'release/webrtc-voice' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
2024-06-12 11:38:14 +02:00
da75fdd7be
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
2024-06-12 11:37:17 +02:00
ed34782283
Merge branch 'main' of github.com:secondlife/viewer into roxie/webrtc-voice
2024-06-11 18:43:34 -07:00
18903f6cac
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/llappearance/llavatarappearance.h
# indra/llimage/llimage.cpp
# indra/llmath/llvolume.cpp
# indra/llmath/llvolume.h
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llshadermgr.cpp
# indra/newview/lldynamictexture.cpp
# indra/newview/llenvironment.cpp
# indra/newview/llfetchedgltfmaterial.cpp
# indra/newview/llfloaterimagepreview.cpp
# indra/newview/llfloaterimagepreview.h
# indra/newview/llfloaterpreference.cpp
# indra/newview/llfloaterregioninfo.cpp
# indra/newview/llfloaterregioninfo.h
# indra/newview/llmaniprotate.cpp
# indra/newview/llmaniptranslate.cpp
# indra/newview/llpanelvolume.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llselectmgr.h
# indra/newview/llsurface.cpp
# indra/newview/llsurface.h
# indra/newview/llsurfacepatch.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/lltinygltfhelper.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llviewerwindow.h
# indra/newview/llvlcomposition.cpp
# indra/newview/llvlcomposition.h
# indra/newview/llvocache.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
2024-06-11 19:04:21 +02:00
0e037b525a
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/llcommon/llprofiler.h
# indra/llmath/llvolume.cpp
# indra/llrender/llshadermgr.cpp
# indra/newview/gltf/buffer_util.h
# indra/newview/lldrawpoolterrain.cpp
# indra/newview/llfloaterimagepreview.h
# indra/newview/llfloaterregioninfo.cpp
# indra/newview/llfloaterregioninfo.h
# indra/newview/llmaniprotate.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llselectmgr.h
# indra/newview/llsurface.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerobject.h
# indra/newview/llviewerregion.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexture.h
# indra/newview/llviewerwindow.cpp
# indra/newview/llviewerwindow.h
# indra/newview/llvlcomposition.cpp
# indra/newview/llvocache.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
2024-06-11 15:47:42 +02:00
1bbe697db7
Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llappearance/llavatarappearance.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvocache.cpp
2024-06-11 14:38:20 +02:00
7c42711ca3
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into project/gltf_development
2024-06-10 16:22:12 -07:00
ee49b3b045
Merge branch 'main' into marchcat/c-merge
...
# Conflicts:
# indra/newview/llviewermenufile.cpp
2024-06-11 01:21:42 +03:00
591c75ebaf
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llappearance/llavatarappearance.cpp
# indra/llmath/llvolume.cpp
# indra/llmessage/llcorehttputil.cpp
# indra/llrender/llgl.cpp
# indra/newview/installers/darwin/apple-notarize.sh
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llfloater360capture.cpp
# indra/newview/llfloateremojipicker.cpp
# indra/newview/llpanelpeople.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/viewer_manifest.py
2024-06-10 21:53:31 +02:00
9663bbe119
Fix Windows build following #1676
2024-06-10 18:39:06 +03:00
a17fd2352a
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcharacter/llkeyframemotion.cpp
# indra/llcharacter/llmotioncontroller.cpp
# indra/llcrashlogger/llcrashlogger.cpp
# indra/llimage/llimagetga.cpp
# indra/llmessage/llregionflags.h
# indra/llprimitive/lldaeloader.cpp
# indra/llprimitive/llmodel.cpp
# indra/llrender/llrendertarget.cpp
# indra/llui/llconsole.cpp
# indra/llui/llkeywords.cpp
# indra/llui/llscrolllistctrl.cpp
# indra/llui/lltextbase.cpp
# indra/llui/lltexteditor.cpp
# indra/llui/llurlentry.cpp
# indra/newview/llappearancemgr.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llgiveinventory.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llpanelpeople.cpp
# indra/newview/llpanelpermissions.cpp
# indra/newview/llpanelteleporthistory.cpp
# indra/newview/llvocache.cpp
2024-06-09 16:11:24 +02:00
98f8fdef5a
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-06-08 11:15:01 +02:00
b740bfb21c
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/newview/llviewermenu.cpp
2024-06-07 10:47:15 +02:00
6adaf39c13
Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer
2024-06-05 11:25:09 +02:00
7889df945b
Merge remote-tracking branch 'origin/release/materials_featurette' into project/gltf_development
2024-06-04 17:39:39 -07:00
c1dc9b21df
Update tinyexr package to package based on secondlife/3p-tinyexr.
2024-06-04 16:55:44 -04:00
395c1c6adf
Remove obsolete Windows package for llphysicsextensions_source
2024-06-03 14:49:29 +02:00
fa2b0e2135
Fix Windows build following #1613
2024-06-03 14:48:01 +02:00
c3fe64e6be
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/llviewermenu.cpp
# indra/newview/llvocache.cpp
2024-05-30 21:46:44 +02:00
891162d0a3
Fix a few things and update the autobuild to the new file
...
Tools for this version are https://3p.firestormviewer.org/Tracy.zip
2024-05-29 23:53:18 +01:00
9f6849e081
Merge remote-tracking branch 'origin/project/gltf_development' into brad/merge-maint-a-to-dev
2024-05-23 11:35:23 -07:00
a1f49564d6
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-maint-a-to-dev
2024-05-23 11:31:19 -07:00
ea5ead6f4a
Merge remote-tracking branch 'FS600/master'
...
# Conflicts:
# doc/contributions.txt
# indra/llimage/tests/llimageworker_test.cpp
# indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
2024-05-23 18:15:07 +02:00
c203bb650a
Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/newview/app_settings/settings.xml
# indra/newview/llinventorymodel.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/xui/en/notifications.xml
2024-05-23 01:48:45 +02:00
1b67dd855c
Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A
...
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llaudio/llaudioengine_fmodstudio.cpp
# indra/llaudio/llaudioengine_fmodstudio.h
# indra/llaudio/lllistener_fmodstudio.cpp
# indra/llaudio/lllistener_fmodstudio.h
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/llaudio/llstreamingaudio_fmodstudio.h
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llimage/tests/llimageworker_test.cpp
# indra/llmessage/tests/llmockhttpclient.h
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llfontfreetype.cpp
# indra/llui/llcombobox.cpp
# indra/llui/llfolderview.cpp
# indra/llui/llfolderviewmodel.h
# indra/llui/lllineeditor.cpp
# indra/llui/lllineeditor.h
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltextvalidate.cpp
# indra/llui/lltextvalidate.h
# indra/llui/lluictrl.h
# indra/llui/llview.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappearancemgr.cpp
# indra/newview/llappearancemgr.h
# indra/newview/llavatarpropertiesprocessor.cpp
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llbreadcrumbview.cpp
# indra/newview/llbreadcrumbview.h
# indra/newview/llbreastmotion.cpp
# indra/newview/llbreastmotion.h
# indra/newview/llconversationmodel.h
# indra/newview/lldensityctrl.cpp
# indra/newview/lldensityctrl.h
# indra/newview/llface.inl
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llfloateremojipicker.h
# indra/newview/llfloaterimsessiontab.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterprofiletexture.h
# indra/newview/llgesturemgr.cpp
# indra/newview/llgesturemgr.h
# indra/newview/llimpanel.cpp
# indra/newview/llimpanel.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryclipboard.cpp
# indra/newview/llinventoryclipboard.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorygallery.cpp
# indra/newview/lllistbrowser.cpp
# indra/newview/lllistbrowser.h
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofile.h
# indra/newview/llpreviewgesture.cpp
# indra/newview/llsavedsettingsglue.cpp
# indra/newview/llsavedsettingsglue.h
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llurllineeditorctrl.cpp
# indra/newview/llvectorperfoptions.cpp
# indra/newview/llvectorperfoptions.h
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
# indra/test/test.cpp
2024-05-22 19:04:52 +02:00
3da533c5eb
Merge remote-tracking branch 'LGPL/master'
...
# Conflicts:
# autobuild.xml
2024-05-20 23:46:53 +02:00
3a212d9608
Merge branch 'spaces-merge' into roxie/webrtc-voice
2024-05-20 12:59:59 -07:00
03c4458bdc
#1392 GLTF Upload ( #1394 )
...
* #1392 WIP -- Functional texture upload, stubbed out .bin upload.
* #1392 GLTF Upload WIP -- Emulates successful upload
Successfully uploads texture
Emulates successful .gltf and .bin upload by injecting into local asset cache.
Emulates rez from inventory by setting sculpt ID of selected object
Currently fails in tinygltf parsing due to missing .bin
* Add missing notification
* Build fix
* #1392 Add boost::json .gltf reading support.
* #1392 boost::json GLTF writing prototype
* Create gltf/README.md
* Update README.md
* Update README.md
* Update README.md
* Update README.md
* Update README.md
* #1392 Add ability to render directly from LL::GLTF::Material
* Fix for mac build
* Mac build fix
* #1392 AssetType and Inventory Type plumbing
* #1392 More sane error handling and scheduling of uploads.
* #1392 Actually attempt to upload glbin
* Mac build fix, upload nudge
* Mac build fix
* Fix glTF asset uploads to server
* Mac build fix (inline not static)
* More consistent inline
* Add glm, mac nudge.
* #1392 For consistency with spec, start using glm over glh:: and LLFoo
* Another attempt at placating Mac builds
* Another Mac nudge
* Mac build take 23
* #1392 Prune LLMatrix4a from GLTF namespace.
* #1392 Fix for orientation being off (glm::quat is wxyz, not xyzw)
* #1392 WIP -- Actually send the sculpt type and id, nudge readme and alpha rendering
* #1392 Working download!
* #1394 Add support for GLTFEnabled SimulatorFeature
* #1392 Review feedback
---------
Co-authored-by: Pepper Linden <3782201+rohvani@users.noreply.github.com>
2024-05-20 13:22:55 -05:00
dfdd84e44b
Update threejs to use the platform agnostic package
2024-05-16 17:00:21 +03:00
0ecfbc3de9
Merge remote-tracking branch 'LGPL/master'
...
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llappearance/llwearable.cpp
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llmessage/tests/llmockhttpclient.h
# indra/llrender/llfontfreetype.cpp
# indra/llui/llcombobox.cpp
# indra/llui/llfolderview.cpp
# indra/llui/llfolderviewmodel.h
# indra/llui/lllineeditor.cpp
# indra/llui/lllineeditor.h
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltextvalidate.cpp
# indra/llui/lltextvalidate.h
# indra/llui/lluictrl.h
# indra/llui/llview.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappearancemgr.cpp
# indra/newview/llappearancemgr.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llbreadcrumbview.cpp
# indra/newview/llbreadcrumbview.h
# indra/newview/llbreastmotion.cpp
# indra/newview/llbreastmotion.h
# indra/newview/llconversationmodel.h
# indra/newview/lldensityctrl.cpp
# indra/newview/lldensityctrl.h
# indra/newview/llface.inl
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llfloateremojipicker.h
# indra/newview/llfloaterimsessiontab.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterprofiletexture.h
# indra/newview/llgesturemgr.cpp
# indra/newview/llgesturemgr.h
# indra/newview/llgroupactions.cpp
# indra/newview/llimpanel.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryclipboard.cpp
# indra/newview/llinventoryclipboard.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorygallery.cpp
# indra/newview/lllistbrowser.cpp
# indra/newview/lllistbrowser.h
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpreviewgesture.cpp
# indra/newview/llsavedsettingsglue.cpp
# indra/newview/llsavedsettingsglue.h
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llurllineeditorctrl.cpp
# indra/newview/llvectorperfoptions.cpp
# indra/newview/llvectorperfoptions.h
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
2024-05-16 14:10:55 +02:00
343aeeeb36
Merge remote-tracking branch 'LGPL/master'
...
# Conflicts:
# doc/contributions.txt
# indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
2024-05-16 02:11:51 +02:00
d9153532b8
Merge branch 'main' into marchcat/x-mf-merge
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llfloaterimagepreview.cpp
2024-05-15 12:51:21 +03:00
094dcc07f8
Merge DRTVWR-591-maint-X to main on promotion of secondlife/viewer #705 : Maintenance X
2024-05-14 21:02:28 -04:00
2688c36b7f
Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llprimitive/llgltfmaterial.h
# indra/newview/app_settings/settings.xml
# indra/newview/llmaniptranslate.cpp
2024-05-14 23:05:59 +02:00
31a3423239
Merge remote-tracking branch 'origin/release/materials_featurette' into project/gltf_development
2024-05-14 11:07:13 -07:00
1e9e5a7b76
Merge remote-tracking branch 'origin/main' into release/materials_featurette
2024-05-14 09:42:24 -07:00
cdeeadf51e
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/llwindow/llwindowwin32.cpp
# indra/newview/lltextureview.cpp
2024-05-13 21:08:10 +02:00
f5d4e5f50a
Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer
2024-05-13 17:29:24 +02:00
e316f5cff9
Merge branch 'main' into DRTVWR-591-maint-X
...
# Conflicts:
# autobuild.xml
2024-05-13 17:29:07 +03:00
223ac67c75
Merge branch 'project/webrtc-voice' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/newview/llvoicevivox.cpp
2024-05-12 17:16:46 +02:00
184ed063a0
Merge branch 'main' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
2024-05-12 16:19:07 +02:00
c2d3c47bad
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
2024-05-12 16:01:58 +02:00
85af619bbb
Reapply slvoice package URLs with autobuild 3.9.5
2024-05-10 09:10:18 -04:00
508ab2df1c
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-600
...
# Conflicts:
# indra/llimage/llimage.cpp
# indra/llimage/llimage.h
# indra/llmath/llvolume.cpp
# indra/llmath/llvolume.h
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llshadermgr.cpp
# indra/newview/lldynamictexture.cpp
# indra/newview/llenvironment.cpp
# indra/newview/llfetchedgltfmaterial.cpp
# indra/newview/llfloaterimagepreview.h
# indra/newview/llfloaterregioninfo.cpp
# indra/newview/llfloaterregioninfo.h
# indra/newview/llmaniprotate.cpp
# indra/newview/llmaniptranslate.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llselectmgr.h
# indra/newview/llsurface.cpp
# indra/newview/llsurface.h
# indra/newview/llsurfacepatch.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/lltinygltfhelper.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llviewerwindow.h
# indra/newview/llvlcomposition.cpp
# indra/newview/llvlcomposition.h
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
2024-05-10 12:40:19 +02:00
692a5eb2d3
Remove `creds=github` from slvoice platform entries.
...
https://github.com/secondlife/autobuild/issues/46
Also remove temporary `continue-on-error` setting.
2024-05-09 11:12:18 -04:00
f0e4dcdaf6
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llthread.h
# indra/llmessage/llcachename.cpp
# indra/llui/lllineeditor.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/llwindow/llwindowwin32.cpp
# indra/newview/llchatitemscontainerctrl.cpp
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llimprocessing.cpp
# indra/newview/llimview.cpp
# indra/newview/llnotificationhandlerutil.cpp
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltextureview.cpp
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexture.h
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoavatar.cpp
2024-05-08 05:10:22 +02:00
155ddf2336
Merge pull request #1421 from secondlife/DRTVWR-600-maint-A
...
Drtvwr 600 maint a
2024-05-07 09:47:37 -05:00
15d4db0b5d
openal @rpath fix
2024-05-07 08:25:49 +03:00
4af9128db1
Merge branch 'main' of https://github.com/secondlife/viewer into roxie/webrtc-voice
2024-05-06 16:40:12 -07:00
c6d752b880
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into gltf-dev-maint-a-merge
2024-05-06 16:48:58 -05:00
3c023813dc
Update to S3-published GHA build of slvoice.
2024-05-06 12:34:41 -04:00
5e5edd78ed
Merge branch 'webrtc-voice' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
2024-05-03 14:00:17 +02:00
5f1a19af72
Merge remote-tracking branch 'LL/marchcat/x-ws-merge'
...
# Conflicts:
# autobuild.xml
# indra/linux_crash_logger/llcrashloggerlinux.cpp
# indra/newview/llappviewerlinux_api.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerlinux_api_dbus.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llcallbacklist.cpp
# indra/newview/llimpanel.h
2024-05-01 12:30:57 +02:00
9bf2dfbb39
Use s3 hosted slvoice autobuild dependencies
...
Pull SLVoice from s3 so that the OSS build configurations work.
2024-04-29 23:51:02 +03:00
f4250bcfaf
Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/llmanip.cpp
# indra/newview/llmaniptranslate.cpp
# indra/newview/llselectmgr.h
# indra/newview/pipeline.h
2024-04-24 22:05:15 +02:00
4a2790a987
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/newview/app_settings/graphic_preset_controls.xml
2024-04-24 21:10:15 +02:00
af91e8a412
Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
2024-04-24 19:54:13 +02:00
b527620dfc
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-04-24 19:53:03 +02:00
7a2070d795
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# 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/llinventorybridge.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpanelgroupbulkban.cpp
# indra/newview/llscrollingpanelparam.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llsidepanelappearance.cpp
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llvovolume.cpp
2024-04-24 18:59:46 +02:00
86c0c1d553
Merge remote-tracking branch 'origin/main' into release/materials_featurette
2024-04-24 09:55:34 -07:00
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
428f21cf79
Merge branch 'main' into marchcat/x-merge
2024-04-24 18:45:54 +03:00
e361671018
Port from OpenEXR to TinyEXR for reduced installer and library size ( #1287 )
2024-04-19 14:39:28 -05:00
3ebf8761bc
Update autobuild.xml
2024-04-19 11:17:33 -05:00
f5c5c5ec94
Issue in WebRTC was disabling custom audio processing (level detection)
...
There is a case where the custom audio processor, which is used to
determine audio levels, was disabled on connection shutdown even
when another connection was established.
This issue has been patched in the webrtc library.
2024-04-16 23:11:44 -07:00
355f231f0c
Merge pull request #1224 from nerodevo/autobuild-revert
...
Revert removal of llphysicsextension_stub for Windows
2024-04-16 21:58:36 +03:00
d06e000435
Change windows to windows64 again
...
Missed the second change... Here it is.
2024-04-16 11:08:23 -05:00
b04b4de465
Change windows to windows64
2024-04-16 10:52:24 -05:00
89b5410d0c
Merge branch 'webrtc-voice' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llprofilercategories.h
# indra/llwebrtc/llwebrtc.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llimview.cpp
# indra/newview/skins/default/xui/en/panel_preferences_sound.xml
2024-04-16 12:53:16 +02:00
0cf61eed93
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# indra/newview/llvoicevivox.cpp
2024-04-16 11:41:43 +02:00
ae79615794
Revert "DRTVWR-601: Drop 32-bit Windows build of llphysicsextension_stub."
...
This reverts commit d07cd115e3
2024-04-13 06:31:38 -05:00
7355b798d2
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# indra/llimage/llimageworker.cpp
# indra/llimage/llimageworker.h
# indra/newview/llcontrolavatar.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/lloutfitslist.h
# indra/newview/llpaneleditwearable.cpp
# indra/newview/lltexturefetch.cpp
2024-04-12 19:33:20 +02:00
eab5beb54c
Merge branch 'main' into marchcat/x-merge
...
# Conflicts:
# indra/llimage/llimageworker.cpp
# indra/llimage/llimageworker.h
# indra/newview/llcontrolavatar.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/lloutfitslist.h
# indra/newview/lltexturefetch.cpp
2024-04-12 15:43:34 +03:00
4a5b1c1bc5
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/JsonCpp.cmake
# indra/cmake/LLAddBuildTest.cmake
# indra/llcommon/lluuid.cpp
# indra/llcorehttp/CMakeLists.txt
# indra/llmessage/CMakeLists.txt
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llpanelprofilepicks.cpp
# indra/newview/llpreviewscript.cpp
# indra/newview/llpreviewscript.h
# indra/newview/llscripteditor.h
# indra/newview/llviewerassetupload.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewermessage.cpp
# indra/newview/llvoavatar.cpp
# indra/test/CMakeLists.txt
# indra/test/test.cpp
2024-04-12 03:28:00 +02: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
2474e3ba1d
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llsys.cpp
2024-04-10 10:03:37 +02:00
096aef2a72
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-04-10 01:49:35 +02:00
5a47a3cb23
Merge remote-tracking branch 'origin/main' into release/materials_featurette
2024-04-09 14:17:34 -07:00
bc2b88be93
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-04-09 19:46:31 +02:00
06c8475d74
Linux: Remove obsolete gstreamer 0.10 3p package (superseded by existing gstreamer 1.x package), replace 3p dependency for icu4c and fltk with LL provided versions.
2024-04-06 06:01:37 +00:00
17e1f3692c
Port from JsonCPP to Boost.Json for json parsing and serializing ( #1054 )
2024-04-06 02:03:58 +03:00
22d4c8b94d
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-04-02 19:35:40 +02:00
26bdff6572
Linux: Update 3p library packages for SDL2, freetype and open_libndofdev
2024-04-01 09:48:54 +00: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
8693cf763a
Linux: Consume LL provided 3p library dependencies since numerous linux64 builds for them are now available on github, remove unused bundled dependencies (SDL1 and FC)
2024-03-28 14:39:39 +00:00
77b6a6e978
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-03-27 15:32:45 +01:00
32c24ffbd7
Fix merge issues
2024-03-27 15:48:33 +02:00
07b99632f3
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/llcommon/llerror.cpp
# indra/llimage/llimagebmp.cpp
# indra/llimage/llimagetga.cpp
# indra/llrender/llrender.cpp
# indra/llui/lltransutil.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llfloaterenvironmentadjust.cpp
# indra/newview/llpaneleditwater.cpp
# indra/newview/llpanelface.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/skins/default/xui/de/menu_viewer.xml
# indra/newview/skins/default/xui/de/strings.xml
# indra/newview/skins/default/xui/en/strings.xml
2024-03-27 12:48:58 +01:00
cbf6aca2e8
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# .github/workflows/build.yaml
2024-03-27 10:35:43 +01: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
1ae6f5dd6f
Merge branch 'main' into DRTVWR-591-maint-X
...
# Conflicts:
# indra/llui/lltransutil.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llfloaterenvironmentadjust.cpp
# indra/newview/llpaneleditwater.cpp
# indra/newview/llpanelface.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
2024-03-27 00:33:40 +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
c111665779
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-03-26 22:29:40 +01:00
a8446ac624
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-03-24 21:52:26 +01:00
81da03f8c7
Fix linux build
2024-03-24 16:56:54 +11:00
051c9bafc8
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-03-23 12:40:26 +01:00
0e2fc4d35e
Clear out observers when terminating a connection
2024-03-19 17:05:56 -07:00
39c32ae9ca
Revert "use the github release asset path for autobuild webrtc"
...
This reverts commit 3794e3275c
2024-03-19 17:10:36 +01:00
5e75273b49
Merge branch 'webrtc-voice' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/00-Common.cmake
# indra/newview/app_settings/settings.xml
# indra/newview/llagent.cpp
# indra/newview/llgroupactions.cpp
# indra/newview/llimview.cpp
# indra/newview/llpanelpeople.h
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvoiceclient.cpp
# indra/newview/llvoiceclient.h
# indra/newview/llvoicevivox.cpp
# indra/newview/llvoicevivox.h
# indra/newview/viewer_manifest.py
# scripts/messages/message_template.msg.sha1
2024-03-19 17:09:42 +01:00
3794e3275c
use the github release asset path for autobuild webrtc
2024-03-18 17:32:51 -07:00
2f40b1fcef
update to use public github-based release of autobuild webrtc
2024-03-18 17:13:36 -07:00
159b94d8ea
Linux: dullahan + cef - same version, replace with zstd compressed package instead.
2024-03-18 19:58:23 +11:00
b1a271c3aa
Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/ICU4C.cmake
# indra/llui/lltextbase.h
# indra/llui/llview.h
# indra/newview/CMakeLists.txt
# indra/newview/llfloateremojipicker.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterprofiletexture.h
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofile.h
# indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
# indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
2024-03-17 17:53:34 +01:00
159ef68fa7
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/llrender/llfontgl.cpp
# indra/llrender/llfontgl.h
# indra/llui/lltextbase.cpp
# indra/llui/lltexteditor.cpp
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llfloateremojipicker.cpp
2024-03-17 16:41:38 +01:00
efe7cdf153
Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/newview/app_settings/settings.xml
# indra/newview/skins/default/xui/de/panel_region_terrain.xml
# indra/newview/skins/default/xui/es/panel_region_terrain.xml
# indra/newview/skins/default/xui/fr/panel_region_terrain.xml
# indra/newview/skins/default/xui/it/panel_region_terrain.xml
# indra/newview/skins/default/xui/ja/panel_region_terrain.xml
# indra/newview/skins/default/xui/pt/panel_region_terrain.xml
# indra/newview/skins/default/xui/ru/panel_region_terrain.xml
# indra/newview/skins/default/xui/tr/panel_region_terrain.xml
# indra/newview/viewer_manifest.py
2024-03-15 22:52:24 +01:00
Rye Mutt