ca1fe0192a
Merge some changes from develop-linux
...
typo >w>
2026-02-09 17:53:55 +02:00
f8730526a6
Clean up this old merge issue
2025-12-11 15:18:44 +01:00
51f7e7a7d7
Merge branch 'release/2025.08' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llfloatermarketplace.cpp
# indra/newview/llviewermessage.cpp
# indra/newview/skins/default/xui/en/panel_preferences_move.xml
2025-11-17 23:37:55 +01:00
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
5f90941c8c
Fix Linux gcc-14 builds: prevent null passing in to memcmp
2025-11-17 15:37:58 +00:00
bcecb3dc10
#4949 QueuedRequest destructor crash
2025-11-10 08:09:07 +02:00
574dc5b65a
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-10-31 19:25:58 +01:00
b37a210e38
Fixed up the i prefix to g to follow coding standards
...
Changed iWebRTCUpdateDevices and iAudioDeviceMutex to gWebRTCUpdateDevicesand gAudioDeviceMutex to follow Firestorm coding standards.
They are global static variables.
2025-10-29 15:37:55 -03:00
6ad9a57c39
FIRE-36022 - Removing my USB headset crashes entire viewer - audio device mutex
...
As with the previous change, this is to address the issue FIRE-36022 where users who remove their USB headsets with microphones are having the viewer lock up.
This introduces a new inline mutex called iAudioDeviceMutex. This is stored in a shared header file located on llcommon. iAudioDeviceMutex is a timed_mutex which allows for a time limit to be placed on a wait for a lock. Once the time runs out or the lock is achiveved the code moves on. With a check after the lock, if the owner is the current thread, then the lock was successful, otherwise it's still being used by another thread and the function should exit to try again later on.
This logic is wrapping WebRTC, FMOD and Vinvox calls to the audio hardware by the Viewer. OpenAL does not currently support changing of audio hardware and always defaults to the default audio hardware.
Added exceptions handling for the new unique_lock with the timed_mutex as they can throw 2 exceptions if the thread is already locked by the current thread and if the mutex is invalid.
Further testing may reveal other areas which would need the timed_mutex added to protect from threads locking up.
2025-10-28 23:22:13 -03:00
f3bce39d28
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llfile.cpp
# indra/llui/llviewereventrecorder.cpp
2025-10-21 00:24:37 +02:00
aa49a3d7e6
Fix typo in comment
2025-10-21 00:50:27 +03:00
f58a7c7673
Make changes according to recommendations by Copilot
...
- correction spelling of suppress_error
- improved error handling in remove() based on functionality in get_fileattr() and somewhat changed error handling in get_fileattr() itself
- call explicitly LLFile::fopen() to make sure we use the correct file path conversion under Windows
Removing Flawfinder comments since Flawfinder isn't used in the viewer anymore
Adding an option to support symlink detection in getattr()
Adding comments to function implementation to indicate that they are really static functions of the LLFile class
2025-10-21 00:50:27 +03:00
2adf1bbdcb
Remove trailing space
2025-10-21 00:50:27 +03:00
49a850ccc1
Remove a trailing space and a missed LLFile::remove() call right before the LLFile::rename()
2025-10-21 00:50:27 +03:00
e12958161c
Improve LLFile to be consistent between Windows and Linux/Mac
2025-10-21 00:50:27 +03:00
9c9f555ae3
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-202507
...
# Conflicts:
# autobuild.xml
# indra/cmake/LLPhysicsExtensions.cmake
2025-10-18 12:44:12 +02:00
6a522ed3fb
Initial fixes for 2025.07 to compile on MacOS
2025-10-17 15:25:28 +10:00
8a2c295298
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llfloaterpreference.cpp
# indra/newview/skins/default/xui/en/panel_preferences_move.xml
# indra/newview/skins/default/xui/ja/floater_360capture.xml
# indra/newview/skins/default/xui/ja/floater_about_land.xml
# indra/newview/skins/default/xui/ja/floater_edit_ext_day_cycle.xml
# indra/newview/skins/default/xui/ja/floater_god_tools.xml
# indra/newview/skins/default/xui/ja/floater_inspect.xml
# indra/newview/skins/default/xui/ja/floater_joystick.xml
# indra/newview/skins/default/xui/ja/floater_land_holdings.xml
# indra/newview/skins/default/xui/ja/floater_lsl_guide.xml
# indra/newview/skins/default/xui/ja/floater_model_preview.xml
# indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
# indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml
# indra/newview/skins/default/xui/ja/floater_preferences.xml
# indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml
# indra/newview/skins/default/xui/ja/floater_preferences_view_advanced.xml
# indra/newview/skins/default/xui/ja/floater_scene_load_stats.xml
# indra/newview/skins/default/xui/ja/floater_settings_debug.xml
# indra/newview/skins/default/xui/ja/floater_snapshot.xml
# indra/newview/skins/default/xui/ja/floater_stats.xml
# indra/newview/skins/default/xui/ja/floater_tools.xml
# indra/newview/skins/default/xui/ja/floater_top_objects.xml
# indra/newview/skins/default/xui/ja/floater_ui_preview.xml
# indra/newview/skins/default/xui/ja/menu_attachment_other.xml
# indra/newview/skins/default/xui/ja/menu_avatar_other.xml
# indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml
# indra/newview/skins/default/xui/ja/menu_gesture_gear.xml
# indra/newview/skins/default/xui/ja/menu_inventory.xml
# indra/newview/skins/default/xui/ja/menu_participant_list.xml
# indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml
# indra/newview/skins/default/xui/ja/menu_profile_other.xml
# indra/newview/skins/default/xui/ja/menu_profile_self.xml
# indra/newview/skins/default/xui/ja/menu_settings_gear.xml
# indra/newview/skins/default/xui/ja/menu_url_agent.xml
# indra/newview/skins/default/xui/ja/menu_viewer.xml
# indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml
# indra/newview/skins/default/xui/ja/notifications.xml
# indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
# indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml
# indra/newview/skins/default/xui/ja/panel_edit_universal.xml
# indra/newview/skins/default/xui/ja/panel_group_bulk_ban.xml
# indra/newview/skins/default/xui/ja/panel_group_creation_sidetray.xml
# indra/newview/skins/default/xui/ja/panel_group_notices.xml
# indra/newview/skins/default/xui/ja/panel_landmark_info.xml
# indra/newview/skins/default/xui/ja/panel_main_inventory.xml
# indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml
# indra/newview/skins/default/xui/ja/panel_nearby_media.xml
# indra/newview/skins/default/xui/ja/panel_people.xml
# indra/newview/skins/default/xui/ja/panel_performance_autoadjustments.xml
# indra/newview/skins/default/xui/ja/panel_performance_preferences.xml
# indra/newview/skins/default/xui/ja/panel_place_profile.xml
# indra/newview/skins/default/xui/ja/panel_postcard_settings.xml
# indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
# indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
# indra/newview/skins/default/xui/ja/panel_preferences_colors.xml
# indra/newview/skins/default/xui/ja/panel_preferences_general.xml
# indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
# indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
# indra/newview/skins/default/xui/ja/panel_presets_pulldown.xml
# indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml
# indra/newview/skins/default/xui/ja/panel_profile_secondlife.xml
# indra/newview/skins/default/xui/ja/panel_region_environment.xml
# indra/newview/skins/default/xui/ja/panel_region_estate.xml
# indra/newview/skins/default/xui/ja/panel_region_terrain.xml
# indra/newview/skins/default/xui/ja/panel_status_bar.xml
# indra/newview/skins/default/xui/ja/panel_tools_texture.xml
# indra/newview/skins/default/xui/ja/sidepanel_item_info.xml
# indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
# indra/newview/skins/default/xui/ja/strings.xml
# indra/newview/skins/default/xui/ja/teleport_strings.xml
2025-10-13 22:21:27 +02:00
083a971f31
Avoid stack-buffer overruns in llprocess_test.cpp ( #4824 )
2025-10-13 19:32:54 +03:00
5e5a3f4102
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/lltextbase.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/lleventpoll.cpp
2025-09-22 23:11:55 +02:00
82e431e090
Merge remote-tracking branch 'origin/release/2025.07' into geenz/2025.07-develop
2025-09-18 15:23:26 -04:00
f64a41f09e
LLLeap: handle partial lines in stderr ( #4678 )
2025-09-15 18:24:21 +03:00
a7fe0c1d78
Merge branch 'release/2025.07' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llwindow/llopenglview-objc.mm
2025-09-12 12:42:49 +02:00
f98a61be70
Improvements found in reviewing mac_arm branch #4629
2025-09-10 13:04:04 -07:00
efe97b9940
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/cmake/00-Common.cmake
# scripts/packages-formatter.py
2025-09-09 19:52:09 +02:00
b99cf9fb86
Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/00-Common.cmake
# indra/cmake/APR.cmake
# indra/cmake/Audio.cmake
# indra/cmake/Boost.cmake
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/LLKDU.cmake
# indra/cmake/LLPrimitive.cmake
# indra/cmake/Meshoptimizer.cmake
# indra/cmake/NGHTTP2.cmake
# indra/cmake/OPENAL.cmake
# indra/llaudio/llvorbisencode.cpp
# indra/llcommon/linden_common.h
# indra/llcommon/llcommon.cpp
# indra/llcommon/llfasttimer.cpp
# indra/llcommon/llfasttimer.h
# indra/llcommon/llfile.cpp
# indra/llcommon/llmemory.h
# indra/llcommon/llprofiler.h
# indra/llcommon/llthreadsafequeue.h
# indra/llfilesystem/lldir_win32.cpp
# indra/llkdu/llimagej2ckdu.cpp
# indra/llkdu/llimagej2ckdu.h
# indra/llkdu/llkdumem.h
# indra/llplugin/slplugin/CMakeLists.txt
# indra/llrender/llfontfreetype.cpp
# indra/llrender/llfontfreetype.h
# indra/llwindow/CMakeLists.txt
# indra/llwindow/llopenglview-objc.mm
# indra/llwindow/llwindowmacosx-objc.h
# indra/llwindow/llwindowwin32.cpp
# indra/media_plugins/cef/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/pipeline.cpp
# indra/newview/viewer_manifest.py
2025-09-05 14:55:37 +02:00
e364123e04
Merge pull request #156 from FirestormViewer/improvement/opensim_remove_slt_time
...
[FIRE-34775] Use PST/PDT time while logged into OpenSim instead of SLT
2025-09-04 10:00:13 +01:00
5ffcd3dc88
Fixes for GHA build
2025-08-28 17:58:33 -04:00
2b44464a14
Fix up windows build error in GHA
2025-08-28 06:08:13 -04:00
180ebf3a32
Use PST/PDT when logged into OpenSim instead of SLT
2025-08-27 20:32:24 +10:00
a46d4f0f69
Enable deprecation warnings and suppress a small handful that have no modern replacements
2025-08-22 03:32:02 -04:00
ba30737d8f
Merge branch 'develop' of github.com:secondlife/viewer into rye/infinitemac
2025-08-20 18:04:55 -04:00
539959a7f8
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-develop
...
# Conflicts:
# .github/workflows/qatest.yaml
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llwearableitemslist.cpp
2025-08-06 18:47:44 +02:00
ce9d66cdd1
Merge branch develop into 2025.06
...
# Conflicts:
# indra/newview/llvoavatar.cpp
2025-08-06 16:05:19 +03:00
f37e2785d5
Merge branch 'release/2025.05' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/skins/default/xui/en/panel_preferences_sound.xml
2025-07-27 12:54:37 +02:00
4b69fe396f
#4320 MacOS crash handling
2025-07-19 20:47:47 +03:00
bfd99549b0
Merge branch 'release/2025.05' of https://github.com/secondlife/viewer
...
# Conflicts:
# .github/pull_request_template.md
# indra/llappearance/lltexlayer.cpp
# indra/llcommon/llthread.cpp
# indra/llprimitive/lldaeloader.cpp
# indra/llprimitive/lldaeloader.h
# indra/llprimitive/llmodel.cpp
# indra/newview/CMakeLists.txt
# indra/newview/VIEWER_VERSION.txt
# indra/newview/app_settings/settings.xml
# indra/newview/llmodelpreview.cpp
# indra/newview/lltoolpie.cpp
# indra/newview/skins/default/xui/en/floater_model_preview.xml
# indra/newview/skins/default/xui/en/panel_preferences_sound.xml
2025-07-18 14:14:54 +02:00
7d03d5af2a
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-07-09 22:50:15 +02:00
6e65c3821e
#4319 Thread crashes not being reported to bugsplat
2025-07-08 00:00:14 +03:00
f9e76e671b
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master
2025-06-25 20:40:00 +02:00
de0cffb57f
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-06-23 22:39:59 +02:00
759654adab
FIRE-35685: Allow (re-)importing access lists from exported lists in CSV files (or any CSV file containing a UUID column)
2025-06-23 15:35:29 +02:00
b7063272ff
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master
2025-06-16 12:46:50 +02:00
3f4d28329f
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-06-15 17:58:08 +02:00
22afbf9991
Replace FSUUIDHash with LL implementation for unordered containers
2025-06-09 21:55:10 +02:00
159c05a5ac
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master
...
# Conflicts:
# .github/workflows/qatest.yaml
# indra/newview/skins/default/xui/ja/strings.xml
2025-05-30 13:26:29 +02:00
e0ffe6c160
Merge branch 'release/2025.05' of https://github.com/secondlife/viewer
...
# Conflicts:
# .github/workflows/qatest.yaml
# indra/llcommon/llsdutil.h
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitgallery.h
2025-05-29 12:41:43 +02:00
7b770b1786
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master
...
# Conflicts:
# .github/workflows/qatest.yaml
# indra/llcommon/llsdutil.h
# indra/newview/llinventorybridge.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitgallery.h
# indra/newview/skins/default/xui/ja/strings.xml
2025-05-29 12:34:42 +02:00
b08ba3fa7b
Merge branch 'main' into marchcat/2505-merge
...
# Conflicts:
# .github/workflows/qatest.yaml
# indra/llcommon/llsdutil.h
# indra/llui/llflatlistview.h
# indra/newview/llinventorybridge.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitgallery.h
2025-05-28 21:38:00 +03:00
fe4f85e587
Merge remote-tracking branch 'origin/main' into geenz/2025.04-to-develop
2025-05-28 11:52:16 -04:00
livie