diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-03-18 18:12:20 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-03-18 18:12:20 +0200 |
| commit | 9a2159a0393cae26d66f47fd48f4fa64f055c63e (patch) | |
| tree | 0a931643c637defedeb27cb325ed8ea81022b139 | |
| parent | 073c9f2c924fa9731e611841af9bfe365158a85f (diff) | |
| parent | 4e73121719511e584ab615dc9c5f672704d0cdb7 (diff) | |
Merged in lindenlab/viewer-bear
| -rw-r--r-- | indra/newview/llappviewer.cpp | 5 |
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. |