diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp
index e9504cbba07670402edec02e2c6af85741b6e625..250dfc57139e17854aa6be0110cd58126297991a 100644
--- a/indra/newview/llprogressview.cpp
+++ b/indra/newview/llprogressview.cpp
@@ -133,13 +133,13 @@ void LLProgressView::setVisible(BOOL visible)
 		mFadeTimer.start();
 	}
 	// showing progress view
-	else if (!getVisible() && visible)
+	else if (visible && (!getVisible() || mFadeTimer.getStarted()))
 	{
 		setFocus(TRUE);
 		mFadeTimer.stop();
 		mProgressTimer.start();
 		LLPanel::setVisible(TRUE);
-	}
+	} 
 }
 
 
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 8c76231595c2dd1ca4b043fb347e6227c7ff1ad5..80a210f9bc8b5690e327d91f397496da19187372 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2892,12 +2892,11 @@ http://secondlife.com/download.
    icon="alertmodal.tga"
    name="UpdaterServiceNotRunning"
    type="alertmodal">
-An update is required to log in. May we start the background
-updater service to fetch and install the update?
+There is a required update for your Second Life Installation.
     <usetemplate
      name="okcancelbuttons"
-     notext="Quit"
-     yestext="Start"/>
+     notext="Quit Second Life"
+     yestext="Download and install now"/>
   </notification>
 
   <notification