diff options
| author | Erik Kundiman <erik@megapahit.org> | 2026-04-22 17:01:25 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2026-04-22 17:01:25 +0800 |
| commit | c5054eeb37e379f3b19b63f5f4ff28095e05c3cd (patch) | |
| tree | 7c7086380d776a1877be7048d3ca1927c1fc1fb9 /indra/newview/llappviewerwin32.cpp | |
| parent | ed4806091069a3c165978dc768ffe7de32c88b2b (diff) | |
| parent | df5e1c1613798b51fb516c63a52fdbf8b8419fee (diff) | |
Merge tag 'Second_Life_Release#df5e1c16-26.2' into 2026.02
Diffstat (limited to 'indra/newview/llappviewerwin32.cpp')
| -rw-r--r-- | indra/newview/llappviewerwin32.cpp | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp index 3ebd8c7019..e5fc256981 100644 --- a/indra/newview/llappviewerwin32.cpp +++ b/indra/newview/llappviewerwin32.cpp @@ -455,22 +455,8 @@ int APIENTRY WINMAIN(HINSTANCE hInstance, // commands and exit the process before we do anything else. if (!velopack_initialize()) { + // Obsolete? Always return true // Velopack handled the invocation (install/uninstall hook) - - // Drop install related settings - gDirUtilp->initAppDirs("SecondLife"); - - std::string user_settings_path = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "settings.xml"); - LLControlGroup settings("global"); - if (settings.loadFromFile(user_settings_path)) - { - // If user reinstalls or updates, we want to recheck for nsis leftovers. - if (settings.controlExists("PreviousInstallChecked")) - { - settings.setBOOL("PreviousInstallChecked", false); - } - settings.saveToFile(user_settings_path, true); - } return 0; } #endif |
