3501 Commits
Author SHA1 Message Date
Beq 47f5a6b34e Updated 3p-fonts to 1.1.3
1.1.3 contains Inter-tight
2026-06-29 18:52:57 +01:00
Ansariel 31d4f438a9 Merge branch 'release/2026.02' of https://github.com/secondlife/viewer
# Conflicts:
#	autobuild.xml
#	indra/llrender/llfontfreetype.cpp
#	indra/newview/skins/default/xui/en/fonts.xml
#	indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
2026-04-15 22:49:32 +02:00
Andrey Kleshchev 7014db297d #2023 Pull in updated pacakge and mark public
Unused fonts were excluded
2026-04-15 22:27:56 +03:00
Andrey Kleshchev 6ee601c642 #2023 Load from a variable font
WIP, beacsue variable fonts are not yeat included.
2026-04-15 22:27:56 +03:00
Ansariel 4008a09ea2 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-202602
# Conflicts:
#	indra/newview/skins/default/xui/en/panel_notification_list_item.xml
2026-04-10 19:55:14 +02:00
Ansariel ad78d8af09 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
#	indra/newview/installers/windows/installer_template.nsi
2026-04-10 19:50:56 +02:00
Jonathan "Geenz" Goodman 8ffb73b4c0 Merge pull request #5475 from secondlife/project/Flat_UI
Flat UI Alpha
2026-04-10 13:10:01 -04:00
Hecklezz 5623d59085 Fix autobuild.xml so Velopack package can be downloaded 2026-04-10 02:40:08 +10:00
Ansariel e1e3a4871e Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/installers/windows/installer_template.nsi
2026-04-08 22:27:26 +02:00
Jonathan "Geenz" GoodmanandAndrey Kleshchev 46412a6bfc Release/26.1.1 (#5530)
* Integrate Velopack installer and update framework

* Add Velopack update support for macOS and VVM integration

* Update Velopack version and dependencies

* Improve Velopack packaging for macOS

* #5346 Uninstall older non-velopack viewer (#5363)

* #5335 Fix silent uninstall asking about registry

* #5346 Uninstall older non-velopack viewer

* Use runtime viewer exe name, handle Velopack URL

* Velopack download failure diagnostic (#5520)

* Velopack download failure diagnostic

* Fix up velopack downloading updates.  Handle updates internally then hand them off to velopack. (#5524)

* More velopack changes.  Should download updates properly now.

* Don't include NSI files

* Restore optional updates, refine viewer restart behavior. (#5527)

* Add support for optional updates.

* Don't restart the viewer after the update unless it was optional.

* Setup UpdaterServiceSetting with velopack properly.

* Refine the restart behavior a bit - readd the old "the viewer must update" UX.

* If the update is still downloading, close should just reopen the downloading dialog.

---------

Co-authored-by: Jonathan "Geenz" Goodman <geenz@lindenlab.com>

* Remove SLVersionChecker from the viewer with velopack. (#5528)

* Remove SLVersionChecker updater integration

* Ensure that the portable install has the correct version number.

* Don't produce shortcuts with VPK - we do this with our post install.

* Bump viewer version from 26.1.0 to 26.1.1

* Potential fix for uninstaller not being functional.

* Fix for UpdaterServiceSetting being ignored.

* Filter for release channel when generating shortcuts.

* Add some more logging for icons on Windows builds.

* More VPK logging.

* Move velopack packaging in CI to the sign and package step.

* Enable velopack downgrade and skip older updates

* Move the version required checking into velopack's checks.

* Potential fix for downgrade prompts.

* Make sure our macOS flow mirrors Windows.

* Make sure to use the dev version of the mac sign and package.

* p#553 Only one of two uninstallers displayed

* #5346 Don't force user to shutdown velopack build for NSIS uninstall

* #5346 Ignore option for the uninstall dialog

* #5346 Fix early exit crash

* #5346 Properly reset version flag.

* Add some autodetect logic on macOS.

* p#564 Clear legacy links

* p#553 Handle uninstall records

* p#549 Permit testing release notes on a test build

* p#564 Remake nsis to velopack update flow

* p#564 Remake nsis to velopack update flow #2

* p#564 Fix incorrect value type

* p#553 Clear velopack's own registry entry in favor of a custom one

* #5346 Resolve duplicated window class name

* Bump to 2.1.0 of sign and package.

---------

Co-authored-by: Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com>
2026-04-07 19:18:44 -04:00
Ansariel 65f893b255 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-202602 2026-04-02 10:05:53 +02:00
Ansariel b663b8cc74 Merge branch 'release/26.1.1' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/llappviewer.cpp
2026-03-25 10:12:53 +01:00
Jonathan "Geenz" Goodman 3946f0b3c3 Update autobuild.xml 2026-03-24 16:37:14 -04:00
Ansariel 796876e6c4 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2026-03-13 10:27:33 +01:00
Ansariel a661145956 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
#	indra/newview/app_settings/settings.xml
2026-03-12 18:44:06 +01:00
Ansariel 65c567bef5 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
#	.github/workflows/build.yaml
#	indra/newview/app_settings/settings.xml
#	indra/newview/llinventorygallerymenu.cpp
#	indra/newview/skins/default/xui/en/notifications.xml
2026-03-12 18:12:12 +01:00
Beq d8449d0519 Update viewer-fonts (emoji) to use DejaVu 2.37 (was 2.30) 2026-03-11 18:25:36 +00:00
Ansariel 5af56f2fd5 Merge branch 'project/Flat_UI' of https://github.com/secondlife/viewer
# Conflicts:
#	autobuild.xml
2026-03-09 13:49:45 +01:00
Ansariel 52896959cb Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-202602 2026-03-09 13:48:54 +01:00
Ansariel 26e1d77e51 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
#	.github/workflows/build.yaml
#	indra/newview/app_settings/settings.xml
#	indra/newview/llinventorygallerymenu.cpp
#	indra/newview/skins/default/xui/en/notifications.xml
2026-03-09 13:23:25 +01:00
Beq 6a098f4aae update fmod to 2.03.12 2026-03-08 22:44:33 +00:00
Jonathan "Geenz" Goodman 8ecbce9b1d Update fonts package. 2026-03-08 16:31:56 -04:00
Ansariel 0f26f3129f Merge branch 'project/Flat_UI' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llrender/llfontfreetype.cpp
#	indra/llui/lldraghandle.cpp
#	indra/llui/lldraghandle.h
#	indra/llui/llfloater.cpp
#	indra/llui/llfloater.h
#	indra/llui/llfolderviewitem.cpp
#	indra/newview/llcolorswatch.cpp
#	indra/newview/llfloaterimcontainer.cpp
#	indra/newview/llvoicewebrtc.cpp
#	indra/newview/skins/default/colors.xml
#	indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Center.png
#	indra/newview/skins/default/textures/bottomtray/Cam_Rotate_In.png
#	indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Center.png
#	indra/newview/skins/default/textures/bottomtray/Cam_Tracking_In.png
#	indra/newview/skins/default/textures/bottomtray/Movement_Backward_On.png
#	indra/newview/skins/default/textures/bottomtray/Movement_Down_On.png
#	indra/newview/skins/default/textures/bottomtray/Movement_Forward_On.png
#	indra/newview/skins/default/textures/bottomtray/Movement_Left_On.png
#	indra/newview/skins/default/textures/bottomtray/Movement_Right_On.png
#	indra/newview/skins/default/textures/bottomtray/Movement_TurnLeft_On.png
#	indra/newview/skins/default/textures/bottomtray/Movement_TurnRight_On.png
#	indra/newview/skins/default/textures/bottomtray/Movement_Up_On.png
#	indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1.png
#	indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2.png
#	indra/newview/skins/default/textures/bottomtray/VoicePTT_On.png
#	indra/newview/skins/default/textures/build/Object_Cone_Selected.png
#	indra/newview/skins/default/textures/build/Object_Cube_Selected.png
#	indra/newview/skins/default/textures/build/Object_Cylinder_Selected.png
#	indra/newview/skins/default/textures/build/Object_Grass_Selected.png
#	indra/newview/skins/default/textures/build/Object_Hemi_Cone_Selected.png
#	indra/newview/skins/default/textures/build/Object_Hemi_Cylinder_Selected.png
#	indra/newview/skins/default/textures/build/Object_Hemi_Sphere_Selected.png
#	indra/newview/skins/default/textures/build/Object_Prism_Selected.png
#	indra/newview/skins/default/textures/build/Object_Pyramid_Selected.png
#	indra/newview/skins/default/textures/build/Object_Ring_Selected.png
#	indra/newview/skins/default/textures/build/Object_Sphere_Selected.png
#	indra/newview/skins/default/textures/build/Object_Tetrahedron_Selected.png
#	indra/newview/skins/default/textures/build/Object_Torus_Selected.png
#	indra/newview/skins/default/textures/build/Object_Tree_Selected.png
#	indra/newview/skins/default/textures/build/Object_Tube_Selected.png
#	indra/newview/skins/default/textures/containers/Accordion_Selected.png
#	indra/newview/skins/default/textures/containers/Toolbar_Middle_Selected.png
#	indra/newview/skins/default/textures/icons/Info_Over.png
#	indra/newview/skins/default/textures/icons/Inv_SysClosed.png
#	indra/newview/skins/default/textures/icons/Inv_SysOpen.png
#	indra/newview/skins/default/textures/icons/SL_Logo.png
#	indra/newview/skins/default/textures/icons/back_arrow_off.png
#	indra/newview/skins/default/textures/icons/back_arrow_over.png
#	indra/newview/skins/default/textures/icons/back_arrow_press.png
#	indra/newview/skins/default/textures/icons/see_me_online.png
#	indra/newview/skins/default/textures/navbar/Favorite_Star_Active.png
#	indra/newview/skins/default/textures/navbar/Favorite_Star_Over.png
#	indra/newview/skins/default/textures/navbar/Row_Selection.png
#	indra/newview/skins/default/textures/widgets/DropDown_On.png
#	indra/newview/skins/default/textures/widgets/ListItem_Over.png
#	indra/newview/skins/default/textures/widgets/ListItem_Select.png
#	indra/newview/skins/default/textures/widgets/PushButton_On.png
#	indra/newview/skins/default/textures/widgets/PushButton_Selected_Press.png
#	indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz.png
#	indra/newview/skins/default/textures/widgets/ScrollThumb_Vert.png
#	indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Disabled.png
#	indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Press.png
#	indra/newview/skins/default/textures/widgets/SliderThumb_Off.png
#	indra/newview/skins/default/textures/widgets/SliderThumb_Press.png
#	indra/newview/skins/default/textures/widgets/SliderTrack_Horiz.png
#	indra/newview/skins/default/textures/windows/Inspector_I.png
#	indra/newview/skins/default/xui/en/floater_avatar_picker.xml
#	indra/newview/skins/default/xui/en/floater_bulk_perms.xml
#	indra/newview/skins/default/xui/en/floater_edit_hover_height.xml
#	indra/newview/skins/default/xui/en/floater_god_tools.xml
#	indra/newview/skins/default/xui/en/floater_model_preview.xml
#	indra/newview/skins/default/xui/en/floater_preferences.xml
#	indra/newview/skins/default/xui/en/floater_tools.xml
#	indra/newview/skins/default/xui/en/floater_world_map.xml
#	indra/newview/skins/default/xui/en/fonts.xml
#	indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
#	indra/newview/skins/default/xui/en/panel_chat_header.xml
#	indra/newview/skins/default/xui/en/panel_group_notices.xml
#	indra/newview/skins/default/xui/en/panel_navigation_bar.xml
#	indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
#	indra/newview/skins/default/xui/en/panel_preferences_general.xml
#	indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
#	indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
#	indra/newview/skins/default/xui/en/panel_preferences_setup.xml
#	indra/newview/skins/default/xui/en/panel_preferences_sound.xml
#	indra/newview/skins/default/xui/en/panel_region_general.xml
#	indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
#	indra/newview/skins/default/xui/en/panel_status_bar.xml
#	indra/newview/skins/default/xui/en/panel_tools_texture.xml
#	indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml
#	indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml
#	indra/newview/skins/default/xui/en/widgets/wearable_outfit_list_item.xml
2026-03-04 14:36:51 +01:00
Ansariel adb569b9c4 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-202601
# Conflicts:
#	indra/newview/quickprefs.cpp
2026-02-25 13:22:19 +01:00
Mnikolenko Productengine e9c4c1aacf Merge branch 'release/2026.02' into maxim/flat-ui-fonts-update
# Conflicts:
#	indra/newview/skins/default/xui/en/panel_preferences_general.xml
2026-02-25 13:45:30 +02:00
Ansariel ddb7ccd27f Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-202601 2026-02-25 12:19:35 +01:00
Ansariel ceac995a57 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
#	indra/newview/llinventorygallerymenu.cpp
2026-02-25 11:53:45 +01:00
Hecklezz b78f211231 Updated WebRTC lib again because it was broken on Linux 2026-02-25 18:34:08 +10:00
Jonathan "Geenz" Goodman ed418397a1 Merge branch 'release/2026.01' into develop 2026-02-24 18:41:26 -05:00
Jonathan "Geenz" Goodman 276cef0623 Merge branch 'release/2026.01' into project/one-click 2026-02-24 11:34:08 -05:00
Roxie Linden 561c66543e In WebRTC.lib, Switch WASAPI playout to timer-driven mode with AUTOCONVERTPCM
Use WAVEFORMATEXTENSIBLE and AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM to
  support devices whose native format differs from 48kHz stereo PCM,
  such as Bluetooth HFP endpoints (16kHz mono) and surround sound
  devices (5.1/7.1).

  Replace the event-driven render loop (AUDCLNT_STREAMFLAGS_EVENTCALLBACK)
  with a timer-driven polling loop to avoid a known issue where
  AUTOCONVERTPCM combined with EVENTCALLBACK causes the audio engine to
  stop signaling render events, resulting in premature thread termination.

  Also adds 192kHz to the supported sample rate list, uses the first
  closest-match format from IsFormatSupported as a fallback when no
  exact match is found, and applies the same changes to the recording
  path.
2026-02-24 19:05:16 +10:00
Ansariel f95833ee6a Merge branch 'project/one-click' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/cmake/Velopack.cmake
#	indra/newview/CMakeLists.txt
#	indra/newview/app_settings/settings.xml
#	indra/newview/installers/windows/installer_template.nsi
#	indra/newview/llappviewer.cpp
2026-02-17 17:14:21 +01:00
Roxie Linden 1594fe9466 In WebRTC.lib, Switch WASAPI playout to timer-driven mode with AUTOCONVERTPCM
Use WAVEFORMATEXTENSIBLE and AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM to
  support devices whose native format differs from 48kHz stereo PCM,
  such as Bluetooth HFP endpoints (16kHz mono) and surround sound
  devices (5.1/7.1).

  Replace the event-driven render loop (AUDCLNT_STREAMFLAGS_EVENTCALLBACK)
  with a timer-driven polling loop to avoid a known issue where
  AUTOCONVERTPCM combined with EVENTCALLBACK causes the audio engine to
  stop signaling render events, resulting in premature thread termination.

  Also adds 192kHz to the supported sample rate list, uses the first
  closest-match format from IsFormatSupported as a fallback when no
  exact match is found, and applies the same changes to the recording
  path.
2026-02-12 16:08:42 -08:00
Ansariel 3456599ae5 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2026-01-25 12:48:31 +01:00
Ansariel 1ca1fbc0cd Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2026-01-23 09:47:43 +01:00
Beq d7a693b017 KDU 7.6.1 - no internal threads 2026-01-22 09:33:35 +00:00
Jonathan "Geenz" Goodman a9d125fa16 Update Velopack version and dependencies 2026-01-21 14:27:14 -05:00
Ansariel 54b7bd3685 Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/cmake/Boost.cmake
#	indra/llxml/llcontrol.cpp
#	indra/newview/llcallingcard.cpp
#	indra/newview/lleventpoll.cpp
#	indra/newview/llviewermessage.cpp
#	indra/newview/skins/default/xui/en/notifications.xml
#	indra/newview/skins/default/xui/en/strings.xml
#	indra/newview/viewer_manifest.py
2026-01-19 10:50:32 +01:00
Mnikolenko Productengine 5daa320717 Merge branch 'project/fonts-update' into project/flat-ui-fonts-update 2026-01-15 21:59:03 +02:00
Andrey Kleshchev 3ad887763b #5271 Update zlib-ng and libraries that depend on it 2026-01-14 21:44:50 +02:00
Andrey Kleshchev 5fbd5a15f3 #5249 Update mesh optimizer to v1.0.1
According to change log it fixes the indices assert among other changes.
2026-01-10 02:48:10 +02:00
Ansariel c6426b9185 Merge branch 'project/one-click' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/cmake/Python.cmake
#	indra/lib/python/indra/util/llmanifest.py
#	indra/newview/CMakeLists.txt
#	indra/newview/viewer_manifest.py
2026-01-08 15:21:12 +01:00
Ansariel 9b9542bbee Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
#	.github/workflows/build.yaml
#	indra/newview/app_settings/settings.xml
2026-01-06 12:55:49 +01:00
Ansariel 5588128c8e It's 2026... 2026-01-01 13:20:57 +01:00
Jonathan "Geenz" Goodman 4dc59a87d1 Integrate Velopack installer and update framework
Note: Updates don't quite work yet.
2025-12-19 12:50:25 -05:00
Ansariel 01d36f60f6 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
#	.github/workflows/build.yaml
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/fsparticipantlist.h
2025-12-03 19:02:00 +01:00
Andrey Kleshchev a58abdac5f Merge branch develop into project/fonts-update
# Conflicts:
#	indra/llrender/llfontfreetype.cpp
2025-11-25 22:34:59 +02:00
Ansariel 0f96cf4e4e Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	.github/workflows/build.yaml
#	indra/newview/llappdelegate-objc.mm
#	indra/newview/llappviewer.cpp
#	indra/newview/llconversationlog.cpp
#	indra/newview/llconversationloglistitem.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/llspeakers.cpp
#	indra/newview/llviewercontrol.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/xui/en/menu_viewer.xml
#	indra/newview/viewer_manifest.py
2025-11-22 13:07:03 +01:00
Andrey Kleshchev 3e7c67b549 #4939 Bugsplat update
to version 1.2.6
2025-11-18 11:08:41 +02:00
Ansariel 8a55580fc9 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
#	indra/cmake/LLPhysicsExtensions.cmake
#	indra/newview/llvoicewebrtc.cpp
2025-11-17 23:26:11 +01:00