Commit Graph

3 Commits (f5d4e5f50ac3645b8fec7c9ee474bdb8ccacea3f)

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 d06c357bab Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-12 11:02:00 +01:00
Beq b8ceff16bb Reinstate filter based deferred profiling
Allow for collection to be deferred until a profiler is connected.
2021-10-12 10:48:12 +01:00