diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2026-05-20 14:14:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-05-20 14:14:46 -0400 |
| commit | acde43cce9700f5c5a50b03b7d96c1db18734e7e (patch) | |
| tree | 885411015577dfaafa844fc8943d834c9d67bd7d /indra/newview/llstartup.cpp | |
| parent | df844170600608b37c2725f7a263f1de3b055618 (diff) | |
| parent | 7a40e2702f7d2a81e674f66f637261a09de5b9ca (diff) | |
Merge pull request #5844 from secondlife/geenz/26.3-to-develop
26.3 to Develop
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 f780e4f5bd..b3ed65be82 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -2637,8 +2637,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; } @@ -2670,7 +2671,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); |