diff options
| author | Erik Kundiman <erik@megapahit.org> | 2026-04-19 10:09:39 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2026-04-19 10:09:39 +0800 |
| commit | e7f6b6bfe322378305e30d132a623cabb3770e19 (patch) | |
| tree | 822aaa835742bb7b0595f9122d1511ad2dde24d1 /indra/newview/llstartup.cpp | |
| parent | b5be5806b37a5696b4960e1366841dfa3887e567 (diff) | |
| parent | 7014db297d2af37eaf391f0adaca4e8d60d4e1ce (diff) | |
Merge tag 'Second_Life_Release#7014db29-26.2' into 2026.02
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 937b680515..98a97b9457 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -2659,8 +2659,9 @@ void uninstall_nsis_if_required() S32 found_minor = 0; S32 found_patch = 0; U64 found_build = 0; + std::string nsis_path; - if (!get_nsis_version(found_major, found_minor, found_patch, found_build)) + if (!get_nsis_version(found_major, found_minor, found_patch, found_build, nsis_path)) { return; } @@ -2692,7 +2693,7 @@ void uninstall_nsis_if_required() // so there is no point to check build. LL_INFOS() << "Found NSIS install " << found_major << "." << found_minor << "." << found_patch << "." << found_build << LL_ENDL; - clear_nsis_links(); + clear_nsis_links(nsis_path); LLSD args; args["VERSION"] = llformat("%d.%d.%d", found_major, found_minor, found_patch); |