diff options
| author | Andrew A. de Laix <alain@lindenlab.com> | 2010-12-08 16:00:05 -0800 |
|---|---|---|
| committer | Andrew A. de Laix <alain@lindenlab.com> | 2010-12-08 16:00:05 -0800 |
| commit | 08a06dca57e2cb0bcf88e49b82776ff1bfa59d27 (patch) | |
| tree | e55834930fc57204ac2538fb14e27b6411927327 /indra | |
| parent | b2cdeb7755febed84c93ead3e8232e4885a494ec (diff) | |
| parent | 27aebda80f302e77a204f5c1931d3e52c6034edb (diff) | |
Automated merge with https://bitbucket.org/mani_linden/viewer-development/
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llprogressview.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp index e9504cbba0..250dfc5713 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 8c76231595..80a210f9bc 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 |