summaryrefslogtreecommitdiff
path: root/indra/llcommon
AgeCommit message (Collapse)Author
2021-09-28Revert "Merge branch 'c++17' into DRTVWR-522-maint"Andrey Lihatskiy
This reverts commit 203ea3a70a775a09cbbffb1740ab7c58f1780baa, reversing changes made to 8e3f0778863a5aa337d1148a243ea91d238a8ac5. # Conflicts: # indra/newview/llmachineid.cpp
2021-09-27SL-16093 Don't force the console window to be open on developer builds ↵Dave Parks
because it causes frame stalls while logging.
2021-09-23DRTVWR-543: Consistently use ClassicCallback<USERDATA> throughout.Nat Goodspeed
2021-09-23DRTVWR-543: Merge branch 'DRTVWR-543-maint' into classicNat Goodspeed
2021-09-23DRTVWR-543: Add ClassicCallback utility class with testsNat Goodspeed
2021-09-22Merge remote-tracking branch 'remotes/origin/DRTVWR-541' into DRTVWR-546Runitai Linden
2021-09-22SL-16014: Fix typoPtolemy
2021-09-22Merge remote-tracking branch 'remotes/origin/DRTVWR-541' into DRTVWR-546Runitai Linden
# Conflicts: # indra/llcommon/linden_common.h
2021-09-22SL-16014: Add Tracy markup for LLEventFilterPtolemy
2021-09-22SL-16014: Add Tracy markup for LLSDPtolemy
2021-09-22SL-16014: Add macros for better markup in TracyPtolemy
2021-09-21SL-16027: Add Tracy OpenGL supportPtolemy
2021-09-16SL-16004 Fix bugsplat displaying wrong top functionAndrey Kleshchev
bugsplat shows KERNELBASE!RaiseException and flush() insread of forceErrorLLError, function crashes too early.
2021-09-15SL-15962 Add hooks for tracy memory profilingDave Houlton
2021-09-15SL-15961 Convert LLMeshRepository::mSkinMap into unordered_map and reduce ↵Runitai Linden
number of per-frame lookups to said map.
2021-09-15SL-15975 Add Tracy-only profile macros that are no-ops when Tracy is disabled.Runitai Linden
2021-09-15SL-15709: Windows: Include Tracy source directly; don't use a libraryPtolemy
2021-09-15SL-15742 - python 3 support for integration test scriptBrad Payne (Vir Linden)
2021-09-15SL-15975 Add Tracy-only profile macros that are no-ops when Tracy is disabled.Runitai Linden
2021-09-15SL-15962 Add hooks for tracy memory profilingDave Houlton
2021-09-14SL-15997 Windows 11 version detectionAndrey Kleshchev
2021-09-09SL-14541 remove mac-crash-loggerAndrey Kleshchev
2021-09-08SL-14541 Replace zlib with zlib-ngAndrey Kleshchev
2021-09-08SL-14541 removed breakpad, win_crash_loggerAndrey Kleshchev
# Conflicts: # autobuild.xml # indra/CMakeLists.txt # indra/newview/CMakeLists.txt # indra/newview/llappviewerwin32.h # indra/win_crash_logger/llcrashloggerwindows.cpp Cherry picked from DRTVWR-520
2021-09-07SL-15832 Add OS bitness to ViewerStatsMnikolenko Productengine
2021-09-03SL-15709: Fix LLCommon not setting Tracy include directory and not linking ↵Ptolemy
to tracy.lib
2021-09-03SL-15709: Add Darwin supportPtolemy
2021-09-03SL-15709: CleanupPtolemy
2021-09-03SL-15709: Default to old fast timersPtolemy
2021-09-03SL-15709: Add Tracy support to viewerPtolemy
2021-09-03SL-15595 update viewer autobuild to import tracy libDave Houlton
2021-09-03SL-15709: Windows: Include Tracy source directly; don't use a libraryPtolemy
2021-09-03Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mixAndrey Lihatskiy
# Conflicts: # indra/newview/llappviewer.cpp # indra/newview/llappviewerwin32.cpp # indra/newview/llmachineid.cpp
2021-08-31SL-15709: Fix LLCommon not setting Tracy include directory and not linking ↵Ptolemy
to tracy.lib
2021-08-27Merge branch 'c++17' into DRTVWR-522-maintAndrey Lihatskiy
2021-08-26SL-15709: Add Darwin supportPtolemy
2021-08-26SL-15709: CleanupPtolemy
2021-08-12Merge branch 'master' into DRTVWR-520-apple-notarizationAndrey Lihatskiy
# Conflicts: # autobuild.xml # build.sh # indra/CMakeLists.txt # indra/newview/CMakeLists.txt # indra/newview/llappviewermacosx.cpp # indra/newview/llappviewerwin32.h # indra/newview/viewer_manifest.py # indra/win_crash_logger/llcrashloggerwindows.cpp
2021-07-30SL-15709: Default to old fast timersPtolemy
2021-07-28SL-15709: Add Tracy support to viewerPtolemy
2021-07-27SL-15595 update viewer autobuild to import tracy libDave Houlton
2021-07-20Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/llcommon/llerror.cpp # indra/llui/llnotifications.h # indra/newview/llappviewer.cpp # indra/newview/llappviewermacosx.cpp
2021-07-19Merge with tip of Master after a Viewer releaseCallum Prentice
2021-07-19SL-15292 Voice's singleton shutdown before voice's coroutineAndrey Kleshchev
2021-07-19Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
2021-07-19Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
2021-07-19Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/llappcorehttp.cpp # indra/newview/llappcorehttp.h
2021-06-29DRTVWR-538: Merge branch 'master' into c++17Nat Goodspeed
2021-06-24SL-15393: Use non-overloaded name for function returning LLSD&.Nat Goodspeed
2021-06-09SL-15365 LLCoros::launch crashAndrey Kleshchev
Superficially looks like an out of memory crash, redirect allocation failures into LL_ERRS.