summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2019-03-04 20:24:00 +0000
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2019-03-04 20:24:00 +0000
commit4e73121719511e584ab615dc9c5f672704d0cdb7 (patch)
tree664019c92394f831bb0ad721b7fa658109dc8082
parent181e66fc12f874c3297ed777ab9d197098941c34 (diff)
Don't create updater when running under debugger.
-rw-r--r--indra/newview/llappviewer.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index b7e2f17c46..c308663a62 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1160,7 +1160,10 @@ bool LLAppViewer::init()
updater.args.add(stringize(gSavedSettings.getU32("ForceAddressSize")));
// Run the updater. An exception from launching the updater should bother us.
- LLLeap::create(updater, true);
+ if (!beingDebugged())
+ {
+ LLLeap::create(updater, true);
+ }
// Iterate over --leap command-line options. But this is a bit tricky: if
// there's only one, it won't be an array at all.