diff options
| author | Palmer <palmer@lindenlab.com> | 2010-05-27 17:19:52 -0700 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2010-05-27 17:19:52 -0700 |
| commit | f6ee642edf4fdcbad9d5138b3ad3b46c83fef0c6 (patch) | |
| tree | 7463a690316256bf75b5bce3dd20645773f2b71b /indra/newview/llstartup.cpp | |
| parent | 0c7fafb70425853df26c703969e7a1892de2374e (diff) | |
| parent | e3753ed8b2c52e98e282e82ea5169bda0b34a2a6 (diff) | |
merge
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 466c154f36..d8b5618d8f 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -385,13 +385,22 @@ bool idle_startup() { LLNotificationsUtil::add("DisplaySetToRecommended"); } + else if ((gSavedSettings.getS32("LastGPUClass") != LLFeatureManager::getInstance()->getGPUClass()) && + (gSavedSettings.getS32("LastGPUClass") != -1)) + { + LLNotificationsUtil::add("DisplaySetToRecommended"); + } else if (!gViewerWindow->getInitAlert().empty()) { LLNotificationsUtil::add(gViewerWindow->getInitAlert()); } gSavedSettings.setS32("LastFeatureVersion", LLFeatureManager::getInstance()->getVersion()); + gSavedSettings.setS32("LastGPUClass", LLFeatureManager::getInstance()->getGPUClass()); + // load dynamic GPU/feature tables from website (S3) + LLFeatureManager::getInstance()->fetchHTTPTables(); + std::string xml_file = LLUI::locateSkin("xui_version.xml"); LLXMLNodePtr root; bool xml_ok = false; |