summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterluadebug.cpp
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2024-10-28 22:53:24 +0200
committerGitHub <noreply@github.com>2024-10-28 22:53:24 +0200
commit9c0a6d1b0e5e9d6da6a63ff367f40ab08c064bbe (patch)
tree70ee7701d7a24a0759915f8050786ed43a8a2a7a /indra/newview/llfloaterluadebug.cpp
parent0ef7a9b39cf72da1211039ab22bdf8f9f6a2c984 (diff)
parentb2f1e8899b32f681e13705d684db9a93d18450ae (diff)
Merge pull request #2966 from secondlife/marchcat/c-develop
develop → Maint C sync
Diffstat (limited to 'indra/newview/llfloaterluadebug.cpp')
-rw-r--r--indra/newview/llfloaterluadebug.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llfloaterluadebug.cpp b/indra/newview/llfloaterluadebug.cpp
index 06877df816..362a02a642 100644
--- a/indra/newview/llfloaterluadebug.cpp
+++ b/indra/newview/llfloaterluadebug.cpp
@@ -58,7 +58,9 @@ bool LLFloaterLUADebug::postBuild()
.listen("LLFloaterLUADebug",
[mResultOutput=mResultOutput](const LLSD& data)
{
- mResultOutput->pasteTextWithLinebreaks(data.asString());
+ LLCachedControl<bool> show_source_info(gSavedSettings, "LuaDebugShowSource", false);
+ std::string source_info = show_source_info ? data["source_info"].asString() : "";
+ mResultOutput->pasteTextWithLinebreaks(stringize(data["level"].asString(), source_info, data["msg"].asString()), true);
mResultOutput->addLineBreakChar(true);
return false;
});