From 1c6bbce5d7bbb1e4a46be17a7e32507041e03ec8 Mon Sep 17 00:00:00 2001 From: Beq Date: Sat, 4 Jan 2025 01:00:18 +0000 Subject: [PATCH] A few more BugSplat related tweaks --- indra/newview/llappviewerwin32.cpp | 2 +- indra/newview/llviewerwindow.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp index ae611bd320..e8dd82fc73 100644 --- a/indra/newview/llappviewerwin32.cpp +++ b/indra/newview/llappviewerwin32.cpp @@ -718,7 +718,7 @@ void LLAppViewerWin32::bugsplatAddStaticAttributes(const LLSD& info) if (bugSplatMap.writeToFile(BugSplatAttributes::getCrashContextFileName())) { - LL_INFOS() << "Crash context saved to " << WCSTR(BugSplatAttributes::getCrashContextFileName()) << LL_ENDL; + LL_INFOS() << "Crash context saved to " << BugSplatAttributes::getCrashContextFileName() << LL_ENDL; } #endif } diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 537da7cef7..030b01a6f3 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -551,9 +551,12 @@ public: static LLCachedControl debugShowMemory(gSavedSettings, "DebugShowMemory"); if (debugShowMemory) { + auto rss = LLMemory::getCurrentRSS() / 1024; addText(xpos, ypos, - STRINGIZE("Memory: " << (LLMemory::getCurrentRSS() / 1024) << " (KB)")); + STRINGIZE("Memory: " << rss << " (KB)")); ypos += y_inc; + LL_PROFILE_PLOT("RSS", (int64_t)rss ); + LL_PROFILE_PLOT("GL:", (int64_t)LLRenderTarget::sBytesAllocated ); } if (gDisplayCameraPos)