Commit Graph

13 Commits (6173233fb01e5baff7b089b27c74924b94cc7c03)

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
Andrey Lihatskiy 1b68f71348 #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
Ansariel 7427b46ea5 Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
#	.gitignore
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/llcommon/llcommon.cpp
#	indra/llcommon/llerror.cpp
#	indra/llcommon/llprofiler.h
#	indra/llcommon/llthread.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llprimitive/llmodel.h
#	indra/llrender/llfontgl.cpp
#	indra/llrender/llfontgl.h
#	indra/llrender/llgl.cpp
#	indra/llrender/llvertexbuffer.cpp
#	indra/llrender/llvertexbuffer.h
#	indra/llwindow/llwindowmacosx.h
#	indra/llwindow/llwindowwin32.cpp
#	indra/llwindow/llwindowwin32.h
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewer.h
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/lldrawpoolavatar.h
#	indra/newview/lldynamictexture.cpp
#	indra/newview/llfloatermodelpreview.cpp
#	indra/newview/llimview.cpp
#	indra/newview/llmeshrepository.h
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llnetmap.cpp
#	indra/newview/llskinningutil.cpp
#	indra/newview/llskinningutil.h
#	indra/newview/llspatialpartition.cpp
#	indra/newview/llteleporthistory.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llviewerobject.cpp
#	indra/newview/llviewerobjectlist.cpp
#	indra/newview/llviewertexture.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llvoicevivox.cpp
#	indra/newview/llvosky.cpp
#	indra/newview/llvovolume.cpp
2021-11-12 15:21:52 +01:00
Dave Parks b4bb74c5de SL-16031 Add support for VS 2019 (requires autobuild 1.2-alpha) 2021-09-22 21:37:01 +00:00
Ansariel 224cb4ba11 FIRE-21781: experience_events.xml log file grows indefinitely 2017-11-24 12:12:11 +01:00
Mnikolenko ProductEngine 1086ce1f09 MAINT-5478 FIXED Keep history according to calendar days and don't completely remove events while changing threshold. 2015-08-25 13:27:50 +03:00
Oz Linden 1fce3cc89e corrections needed for new tools 2015-06-08 17:35:18 -04:00
dolphin d14673988d removed deprecated logging macros 2014-05-07 13:40:34 -07:00
dolphin 572af460ec Attempting to fix the mac build, take 2 2014-03-25 13:01:22 -07:00
dolphin 1d83b76e07 Attempting ti fix the mac build 2014-03-25 12:06:27 -07:00
dolphin 37411bc7eb Experience log panel is live and updates as new events come in.
Multiple identical events get collapsed int a single entry.
2014-03-21 16:58:43 -07:00
dolphin dba034ee10 Experience log panel 2014-03-20 16:32:31 -07:00
dolphin b2591ca63c Added a default message handler for experience logs. Currently just forwards the
notification.
2014-03-18 14:12:22 -07:00