#5346 Properly reset version flag.

Author: akleshchev

indra/newview/llappviewerwin32.cpp

@@ -435,6 +435,20 @@ int APIENTRY WINMAIN(HINSTANCE hInstance,
     if (!velopack_initialize())
     {
         // 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 (settings.controlExists("LastInstallVersion"))
+            {
+                settings.setString("LastInstallVersion", std::string());
+            }
+            settings.saveToFile(user_settings_path, true);
+        }
         return 0;
     }
 #endif

indra/newview/llstartup.cpp

@@ -2619,15 +2619,12 @@ void release_notes_coro(const std::string url)
 void uninstall_nsis_if_required()
 {
 #if LL_VELOPACK && LL_WINDOWS
-    // Todo: perhaps use marker files?
-    // Debug variable isn't specific to one channel
-    // and something channel specific is needed.
     std::string last_install_ver = gSavedSettings.getString("LastInstallVersion");
-    LLVersionInfo* ver_inst = LLVersionInfo::getInstance();
-    if (ver_inst->getChannelAndVersion() == last_install_ver)
+    if (!last_install_ver.empty())
     {
         return;
     }
+    LLVersionInfo* ver_inst = LLVersionInfo::getInstance();
     gSavedSettings.setString("LastInstallVersion",
         ver_inst->getChannelAndVersion());