diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-04-11 17:54:18 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-04-11 17:54:18 +0000 |
| commit | 0277259455c4354f81ea8a24c8ab93f27567bc6f (patch) | |
| tree | f1411dab563dcf697f794e9e8a592a6d3e5c4d2d /indra/newview/llstartup.cpp | |
| parent | 568397bbcc4fca307ebc010ec7f815422b9ba80a (diff) | |
svn merge -r 59968:60342 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index f3a2c629fd..baf6abda11 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -328,13 +328,16 @@ BOOL idle_startup() { gViewerWindow->alertXml("DisplaySetToSafe"); } - else if (gSavedSettings.getS32("LastFeatureVersion") < gFeatureManagerp->getVersion()) + else if ((gSavedSettings.getS32("LastFeatureVersion") < gFeatureManagerp->getVersion()) && + (gSavedSettings.getS32("LastFeatureVersion") != 0)) { - if (gSavedSettings.getS32("LastFeatureVersion") != 0) - { - gViewerWindow->alertXml("DisplaySetToRecommended"); - } + gViewerWindow->alertXml("DisplaySetToRecommended"); } + else if (!gViewerWindow->getInitAlert().empty()) + { + gViewerWindow->alertXml(gViewerWindow->getInitAlert()); + } + gSavedSettings.setS32("LastFeatureVersion", gFeatureManagerp->getVersion()); LLString xml_file = LLUI::locateSkin("xui_version.xml"); |