summaryrefslogtreecommitdiff
path: root/indra/llplugin
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2024-06-11 01:21:42 +0300
committerAndrey Lihatskiy <alihatskiy@productengine.com>2024-06-11 01:21:42 +0300
commitee49b3b045e366aec466f46743214386d7fecb21 (patch)
treed5b498f2a73eb6709b5c24241549f854a14b7bb6 /indra/llplugin
parent8f6e50ed6a8b2a3f7b2a173bf7c535aac13f22b5 (diff)
parenta73773bc1abdac6bc3beea36fd4ba58eba686e13 (diff)
Merge branch 'main' into marchcat/c-merge
# Conflicts: # indra/newview/llviewermenufile.cpp
Diffstat (limited to 'indra/llplugin')
-rw-r--r--indra/llplugin/llpluginprocessparent.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llplugin/llpluginprocessparent.cpp b/indra/llplugin/llpluginprocessparent.cpp
index 567a9b9559..6537733ddf 100644
--- a/indra/llplugin/llpluginprocessparent.cpp
+++ b/indra/llplugin/llpluginprocessparent.cpp
@@ -582,7 +582,7 @@ void LLPluginProcessParent::idle(void)
params.args.add("-e");
params.args.add("tell application \"Terminal\"");
params.args.add("-e");
- params.args.add(STRINGIZE("set win to do script \"gdb -pid "
+ params.args.add(STRINGIZE("set win to do script \"lldb -pid "
<< mProcess->getProcessID() << "\""));
params.args.add("-e");
params.args.add("do script \"continue\" in win");