Commit Graph

5 Commits (c6cdaf705d0fa69e1811c28552dcbf2acef048bf)

Author SHA1 Message Date
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 143b77acc5 Transplant MAINT-7076 Add the ability to see/modify mute types within the block list 2017-03-03 20:47:12 +01:00
Ansariel e1cc6f93d0 Fix firstyear license info in some Firestorm-specific files 2014-09-17 20:52:17 +02:00
Ansariel fe559d7f6e Removed some unnecessary stuff 2014-09-17 19:47:53 +02:00
Ansariel 129e97cc90 FIRE-13262 / FIRE-13683: Replace the mutelist panel with something that doesn't lock up the viewer and scrolls to and selects new mutes properly 2014-09-17 15:40:19 +02:00