diff options
| author | Andrew A. de Laix <alain@lindenlab.com> | 2011-01-26 16:31:15 -0800 |
|---|---|---|
| committer | Andrew A. de Laix <alain@lindenlab.com> | 2011-01-26 16:31:15 -0800 |
| commit | 60696ae986c90068faa0191db737431493796dc1 (patch) | |
| tree | b6ed73c49bd3c3304c2dd5a90cabdc3788af2d30 /indra | |
| parent | 9fa947ef741f6e63be1994e83fcf8f182e7eebed (diff) | |
fix for STORM-940: don't show manditory update dialog if already logged in.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index e92042bcd4..ace1de6131 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2474,10 +2474,14 @@ namespace { // The user never saw the progress bar. notification_name = "RequiredUpdateDownloadedVerboseDialog"; } - else + else if(LLStartUp::getStartupState() < STATE_WORLD_INIT) { notification_name = "RequiredUpdateDownloadedDialog"; } + else + { + ; // Do nothing because user is already logged in. + } } else { |