cf2f48de06
Merge branch 'release/2025.04' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/llflatlistview.cpp
# indra/llui/llstyle.cpp
# indra/llui/llstyle.h
# indra/llui/lltextbase.cpp
# indra/llui/llurlmatch.cpp
# indra/llui/llurlmatch.h
# indra/llui/llurlregistry.cpp
# indra/llui/llurlregistry.h
# indra/newview/llavatarlist.cpp
# indra/newview/llavatarlist.h
# indra/newview/llavatarlistitem.cpp
# indra/newview/llavatarlistitem.h
# indra/newview/llfloaternewfeaturenotification.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llmeshrepository.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llviewerchat.cpp
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/colors.xml
2025-04-26 00:31:04 +02:00
9d6c74a051
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-04-25 22:21:12 +02:00
120f85c9e0
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-develop
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llvieweraudio.cpp
# indra/newview/llvoavatar.h
2025-04-25 22:20:59 +02:00
69a81d641a
#3982 Crash at getChild<LLScrollListCtrl>
...
Notification about inventory change from fetchInventoryFromCapCoro
Looks like floater was closed a moment before receiving inventoryChanged
2025-04-25 23:01:01 +03:00
8665cd3750
#3986 Packet ring crash in memcpy
...
packet_size was negative
2025-04-25 23:01:01 +03:00
17e974689c
Merge pull request #3943 from secondlife/maxim/2025.04-chat-mention
...
#3758 initial chat mention support
2025-04-25 22:31:53 +03:00
25c11f0965
Merge pull request #3981 from secondlife/brad/version-increments
...
Increment viewer version after 2025.03
2025-04-25 10:55:29 -07:00
fb4925d96b
Increment viewer version after 2025.03
2025-04-25 10:52:00 -07:00
1eb34b43fb
#3758 clean up: move EUnderlineLink
2025-04-25 20:22:33 +03:00
b4a136becd
Merge pull request #110 from Hecklezz/fix/preferences_search_highlight_color
...
[FIRE-35405] Fixes preferences search highlight color by having a color picker for both background and font colors
2025-04-25 16:48:15 +01:00
f450b42acf
post merge fix
2025-04-25 17:07:00 +03:00
a7759f3704
Merge branch 'release/2025.04' into 2025.04-chat-mention
2025-04-25 16:40:38 +03:00
222824118f
Merge pull request #111 from DarlCat/FIRE-35294
...
[FIRE-35294] Make minerjr's chat console hiding work with toast chat too
2025-04-25 13:36:14 +01:00
2cb1d483e4
Merge pull request #112 from Hecklezz/fix/map_copy_slurl_coordinates
...
[FIRE-35426] Fix world map copy slurl coordinates getting agent position
2025-04-25 13:34:20 +01:00
d9468ecc59
#3758 disable editing of mention segment
2025-04-25 14:37:19 +03:00
2f973f604b
Fix world map copy slurl not getting the markers coordinate
2025-04-25 21:33:56 +10:00
15eff4adff
[FIRE-35294] minerjr's chat console hiding now works for toast mode as well
2025-04-25 00:20:16 -05:00
89f8171943
#3975 Crash at LLSpatialGroup::dirtyGeom
2025-04-24 22:12:31 +03:00
223eedaf46
Add Sekkmer to viewer contributors for PR#107
2025-04-24 19:49:13 +01:00
6fc1ed0a85
Fix viewertexturelist on Mac
2025-04-24 18:28:33 +01:00
8ba07f3165
Replace JointKey construct with more upstream-based approach, optimized by using std::string_view and heterogeneous map lookups
2025-04-24 19:26:55 +02:00
e377fe66c8
Update German translation
2025-04-24 15:38:30 +02:00
ca164a0f51
Alter Flickr url in all applicable places
2025-04-24 13:48:16 +02:00
9890f07ba7
FIRE-35373, FIRE-35401: Chinese (小滢 Zi Ying), French (Laurent Bechir) and Polish translation updates
2025-04-24 13:45:46 +02:00
b107cda81b
[FIRE-32491] Flickr link broken
...
Old functionality (post upload edit) is no longer supported, instead link to the photo in the user's reel
2025-04-24 02:25:47 +01:00
9259979cc6
[FIRE-35391] Make timestamps in snapshot filenames optional
2025-04-24 02:19:07 +01:00
4adf817950
[FIRE-35388] creation of calling card upon login (experimental fix)
...
This appears to be related to the commits for #3745 from LL, in 25.03. For some reason I do not see this reproducing on LL viewer though.
2025-04-24 01:52:03 +01:00
7bb717f355
[FIRE-35382] - Add share_mutex to fix JointKey::construct lockup
...
Added a share_mutex to the JointKey::construct to fix the lockup when the unordered_map gets corrupted.
Set the shared_lock when reading and unique_lock when writing to.
2025-04-24 00:22:31 +01:00
bf82ab14b5
[FIRE-35393] Improved handling of bad feature notification.
2025-04-23 23:09:28 +01:00
1cca5e08a2
[FIRE-35422] Poser (visual) does not work correctly on attached animesh
2025-04-23 22:56:53 +01:00
17561e2ad1
#3758 show mention name in bubble chat
2025-04-23 21:04:47 +03:00
b1b0cdbcf0
#3784 Increase gltf scale boundaries
2025-04-23 20:09:49 +03:00
205b2282c7
#3920 LLPanel::getString crash
...
Make sure new floater can launch wihtout a key.
It isn't supposed to be launched wihtout a key, but there are some ways
to do that intentionally.
2025-04-23 20:06:52 +03:00
062afc46fb
Mirrors should never be run at ultra except by explicit choice.
2025-04-23 18:06:01 +01:00
da2234a563
#3952 insert @ name at the cursor position
2025-04-23 17:36:50 +03:00
b3fc6c4214
Implemented changing both background and font colours for preference search highlighting.
2025-04-24 00:10:29 +10:00
e5d5845074
Revert "[FIRE-35382] - Add share_mutex to fix JointKey::construct lockup"
...
This reverts commit 4673bab663
2025-04-23 11:01:17 -03:00
4673bab663
[FIRE-35382] - Add share_mutex to fix JointKey::construct lockup
...
Added a share_mutex to the JointKey::construct to fix the lockup when the unordered_map gets corrupted.
Set the shared_lock when reading and unique_lock when writing to.
2025-04-23 10:52:38 -03:00
6239647aa3
#3962 allow Tab work the same way as picking name with Enter
2025-04-23 02:01:01 +03:00
d362e4ed8f
Cleaned up comments (incorrect comment from JIRA title)
2025-04-22 16:54:35 -03:00
8443e783a2
Change dump to use older std::setw instead of std::format
...
Changed dump method for LLViewerTextureList to use std::setw instead of std::format due to gcc 11 support.
2025-04-22 16:49:01 -03:00
b30283e5ef
#3960 Fix expensive mesh thread score calculations
2025-04-22 22:21:29 +03:00
b140b9451d
Update FMOD Studio to 2.03.07 for Linux and MacOS
2025-04-22 19:09:00 +01:00
096e32ff03
Update FMOD Studio to 2.03.07 on Windows
2025-04-22 13:53:58 +02:00
82673191e2
Adjust join changes
2025-04-22 12:51:27 +02:00
af9254e3e3
#3870 Added joint initialization for LLVOAvatarSelf
...
Sometimes mesh thread crashes when allocating joints
2025-04-22 12:17:54 +02:00
9b531e01eb
#3488 Reduce locking
...
1. 'sActive' variables are atomic, no locks needed
2. Fix trylocks. There are internal locks inside loadMeshLOD so without
checking locks 3 and 4 viewer would be locked on each loadMeshLOD,
potentially making main thread wait for threads to unlock.
2025-04-22 12:06:49 +02:00
87b6428f55
#3870 Added joint initialization for LLVOAvatarSelf
...
Sometimes mesh thread crashes when allocating joints
2025-04-22 12:39:42 +03:00
44bbdc549a
#3488 Reduce locking
...
1. 'sActive' variables are atomic, no locks needed
2. Fix trylocks. There are internal locks inside loadMeshLOD so without
checking locks 3 and 4 viewer would be locked on each loadMeshLOD,
potentially making main thread wait for threads to unlock.
2025-04-22 12:39:42 +03:00
5ed95013e4
Merge pull request #107 from Sekkmer/fix-mouselook-clicking
...
Fix object and HUD clicking in mouselook mode
2025-04-22 10:37:38 +01:00
Ansariel