Commits

Scott Lawrence  committed 603fb12 Merge

merge changes for storm-934

  • Participants
  • Parent commits 269fafd, 43f9b2d

Comments (0)

Files changed (2)

File indra/newview/llappviewer.cpp

 
 		if(data["required"].asBoolean())
 		{
-			apply_callback = &apply_update_ok_callback;
 			if(LLStartUp::getStartupState() <= STATE_LOGIN_WAIT)
 			{
 				// The user never saw the progress bar.
+				apply_callback = &apply_update_ok_callback;
 				notification_name = "RequiredUpdateDownloadedVerboseDialog";
 			}
+			else if(LLStartUp::getStartupState() < STATE_WORLD_INIT)
+			{
+				// The user is logging in but blocked.
+				apply_callback = &apply_update_ok_callback;
+				notification_name = "RequiredUpdateDownloadedDialog";
+			}
 			else
 			{
-				notification_name = "RequiredUpdateDownloadedDialog";
+				// The user is already logged in; treat like an optional update.
+				apply_callback = &apply_update_callback;
+				notification_name = "DownloadBackgroundTip";
 			}
 		}
 		else

File indra/viewer_components/updater/llupdaterservice.cpp

 	stopTimer();
 	mNewVersion = newVersion;
 	mIsDownloading = true;
+	setState(LLUpdaterService::DOWNLOADING);
 	mUpdateDownloader.download(uri, hash, newVersion, false);
-	
-	setState(LLUpdaterService::DOWNLOADING);
 }
 
 void LLUpdaterServiceImpl::requiredUpdate(std::string const & newVersion,
 	stopTimer();
 	mNewVersion = newVersion;
 	mIsDownloading = true;
+	setState(LLUpdaterService::DOWNLOADING);
 	mUpdateDownloader.download(uri, hash, newVersion, true);
-	
-	setState(LLUpdaterService::DOWNLOADING);
 }
 
 void LLUpdaterServiceImpl::upToDate(void)