Ansariel
|
3da533c5eb
|
Merge remote-tracking branch 'LGPL/master'
# Conflicts:
# autobuild.xml
|
2024-05-20 23:46:53 +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
|
5e75273b49
|
Merge branch 'webrtc-voice' of https://github.com/secondlife/viewer
# Conflicts:
# autobuild.xml
# indra/cmake/00-Common.cmake
# indra/newview/app_settings/settings.xml
# indra/newview/llagent.cpp
# indra/newview/llgroupactions.cpp
# indra/newview/llimview.cpp
# indra/newview/llpanelpeople.h
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvoiceclient.cpp
# indra/newview/llvoiceclient.h
# indra/newview/llvoicevivox.cpp
# indra/newview/llvoicevivox.h
# indra/newview/viewer_manifest.py
# scripts/messages/message_template.msg.sha1
|
2024-03-19 17:09:42 +01:00 |
|
Ansariel
|
4c89b166dc
|
FIRE-24171: Don't restore sessions if the group is muted - instead leave session entirely
|
2020-08-27 10:56:27 +02:00 |
|
Ansariel
|
31fcc3c1a3
|
FIRE-24171: Add additional logging to find out why this still seems to happen...
|
2020-08-27 07:53:38 +02:00 |
|
Ansariel
|
a35653bff0
|
Clean this up a bit
|
2020-07-26 22:50:33 +02:00 |
|
Ansariel
|
a01747f446
|
FIRE-24171: Ignore group chats on startup until mute list is loaded to prevent showing unwanted group chats
|
2020-07-26 21:16:58 +02:00 |
|
Nicky
|
217e879c20
|
Linux: fstream has no constructor that takes a std::string.
|
2015-05-06 16:34:41 +02:00 |
|
Ansariel
|
cc75b3ba34
|
FIRE-8711: Receive group chat option in group profiles don't work in OpenSim
|
2014-05-29 11:33:56 +02:00 |
|
Ansariel
|
9c25fb8446
|
FIRE-7455: Use mutelist to store info about muted group chats
|
2012-08-28 23:05:55 +02:00 |
|
Ansariel
|
e4cd16fbad
|
FIRE-1379: Additional option to only mute group chats of a particular group - by Katharine Berry (Exodus Viewer)
|
2012-08-11 12:13:28 +02:00 |