Commits

alain_linden committed 0a2ebea

more for storm 940: treat the manditory download after login like an optional one.

Comments (0)

Files changed (1)

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
 			{
-				; // Do nothing because user is already logged in.
+				// The user is already logged in; treat like an optional update.
+				apply_callback = &apply_update_callback;
+				notification_name = "DownloadBackgroundDialog";
 			}
 		}
 		else