Commit Graph

28 Commits (431b3b0c6dc4e5ab07ff3cefd9b21de5580f6902)

Author SHA1 Message Date
Ansariel 324e4725ff Fix crash when parsing asset blacklist data 2025-06-23 19:19:03 +02:00
Ansariel 309552d5aa Maybe let's just make this static instead... 2025-06-19 18:27:37 +02:00
Ansariel 092d98b601 Refactor asset blacklist and replace having to deal with LLSD all the time 2025-06-19 18:23:08 +02:00
Ansariel 9798fae3d2 Make asset blacklist sound flags actually work properly 2025-06-19 13:22:04 +02:00
Ansariel 2c1a10eb09 Refactor some sound blacklisting and terrible old sound explorer code 2025-06-16 11:07:15 +02:00
Rohacan Hirons 17146c4c3b Added a separate column for flags and renamed variables for clarity 2025-06-11 19:10:35 +02:00
Rohacan Hirons 0e41374743 With previous code update muting a sound by its UUID will add a flag NONE, then checking the existence of a flag is not enough we have to be sure flag value is 0 2025-06-11 12:38:41 +02:00
Rohacan Hirons a2135521de Removed french comment 2025-06-11 09:11:16 +02:00
Rohacan Hirons 1a24fd839f Merge worn/rezzed/gesture methods
Added flag to existing blacklist functions
Use of bitfields for blacklist flags
2025-06-10 18:03:06 +02:00
Rohacan Hirons 5b1d898024 Remove use of new asset types to manage sounds source type
Add eBlacklistFlag instead in FSAssetBlacklist to manage sounds source type
2025-06-10 00:10:51 +02:00
Rohacan Hirons c7e593c4ea Fix few minor issues (empty lines, french comment)
Separate attached sounds in two types: attached sounds, gesture sounds
Add the new type, gesture sounds, in all updated files
2025-06-09 12:07:50 +02:00
Rohacan Hirons a620722087 Add check to determine if sound-emitting object is an attachment. Previously, checking if object_id == owner_id was only valid for gestures.
Fix removeItem to fully delete asset ID from all blacklist types
2025-06-09 04:28:03 +02:00
Rohacan Hirons f85c085f5f Added buttons on sounds explorer window to mute all attached / rezzed sounds by avatar 2025-06-09 01:35:21 +02:00
Ansariel 088cc2ea35 Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llcommon/llpointer.h
#	indra/llcommon/llqueuedthread.cpp
#	indra/llfilesystem/llfilesystem.cpp
#	indra/llui/llconsole.cpp
#	indra/llui/llkeywords.cpp
#	indra/llui/llstatgraph.cpp
#	indra/llui/llvirtualtrackball.cpp
#	indra/newview/llagentcamera.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloateremojipicker.cpp
#	indra/newview/llfloaterimnearbychathandler.cpp
#	indra/newview/llfloatersettingsdebug.cpp
#	indra/newview/llfloatersnapshot.cpp
#	indra/newview/llglsandbox.cpp
#	indra/newview/llnetmap.cpp
#	indra/newview/llpanelface.cpp
#	indra/newview/llpanelpermissions.cpp
#	indra/newview/llpanelplaceprofile.cpp
#	indra/newview/llstartup.cpp
#	indra/newview/llviewermessage.cpp
#	indra/newview/llvocache.cpp
#	indra/newview/llworldmapview.cpp
2024-07-09 02:25:42 +02:00
Ansariel 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
Ansariel 41766caa88 FIRE-33740: Fix asset blacklisting not persisting data anymore 2024-03-05 14:55:11 +01:00
Ansariel d3c3df624b Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
#	indra/newview/fsfloaterim.h
2023-07-13 09:22:50 +02:00
Ansariel 71f132cb91 What is this ugly old code? 2023-07-02 19:14:55 +02:00
Ansariel c8b7e97b45 More of "What is all this old crap?" 2023-06-25 18:37:32 +02:00
Zi Ree e5609a8df7 Add animation blacklisting to animation explorer and asset blacklist floater 2023-06-22 11:10:38 +02:00
Ansariel 62b11fc825 Merge branch 'DRTVWR-489-emoji' of https://github.com/secondlife/viewer
# Conflicts:
#	autobuild.xml
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/llcommon/llqueuedthread.cpp
#	indra/llcommon/llsdserialize.h
#	indra/llcommon/llthreadsafequeue.h
#	indra/llinventory/llsettingssky.cpp
#	indra/newview/CMakeLists.txt
#	indra/newview/installers/windows/lang_zh.nsi
#	indra/newview/llappviewer.cpp
#	indra/newview/llnavigationbar.h
#	indra/newview/llpathfindingnavmesh.cpp
#	indra/newview/lltoolcomp.h
#	indra/newview/lltoolfocus.h
#	indra/newview/llviewerhelp.h
#	indra/newview/llvoicevivox.h
2023-02-04 13:39:11 +01:00
Ansariel 6b6b116fd4 Merge branch 'master' of https://bitbucket.org/lindenlab/viewer 2021-03-03 00:20:02 +01:00
Ansariel 2cdc81c61a More asset blacklist optimization: Don't save the blacklist when removing temporary derendered objects 2016-08-29 10:45:20 +02:00
Ansariel 3cffffcdc6 Save asset blacklist when removing items only if the list changed 2016-08-27 16:10:17 +02:00
Ansariel c0d00b60dc De-couple asset blacklist and its floater; use signals to inform floater about updating the UI 2016-08-27 15:50:40 +02:00
Ansariel 81ae9eceb5 FIRE-14265: Checking if this helps with crashes during TP because of blacklisted objects:
* Don't create blacklisted objects at all instead of creating and immediately killing them
* Kill the cache entry for the object once we derender it
* Stop editing the object
2016-08-26 17:22:42 +02:00
Ansariel a5b89c588f More asset blacklist improvements: Don't save the list after adding/removing an item during a bulk operation 2016-08-26 15:48:52 +02:00
Ansariel 12df60d4e1 Major overhaul of the asset blacklist floater:
* Use sorting persistance already available in LLScrollListCtrl and remove specific asset blacklist debug settings
* Add right-click context menu
* Draw stripes for alternating lines for easier reading
* Add missing "Close" button
* Add filter editor for searching for particular assets
* Properly format date based on localizable format string and show time as local time instead of UTC
* Renamed classes to better fit the Firestorm naming system
* Removed unused methods
2016-08-26 11:58:18 +02:00