diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-05-31 16:18:22 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-05-31 16:18:22 +0300 |
| commit | 39eb49c5f400f5e99750f48cc4b02ffa56537403 (patch) | |
| tree | d4bd0217776511c42b2f8a8d525099b4b810fda9 /indra/newview/llstartup.cpp | |
| parent | 9f91d436805137cd347601c7657d90fe19fc98b0 (diff) | |
| parent | de52f3ae69f7641966304ea42d399b62f3fc3170 (diff) | |
Manual merge from default branch.
Semi-automatically resolved conflicts in:
* indra/newview/llappearancemgr.cpp
* indra/newview/llappviewer.cpp
* indra/newview/llcofwearables.cpp
* indra/newview/llinventoryfunctions.cpp
* indra/newview/llpaneloutfitedit.cpp
* indra/newview/skins/default/xui/en/strings.xml
* indra/newview/skins/default/xui/ja/strings.xml
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 466c154f36..6418551517 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; @@ -2723,7 +2732,8 @@ LLSD transform_cert_args(LLPointer<LLCertificate> cert) { LLSD args = LLSD::emptyMap(); std::string value; - LLSD cert_info = cert->getLLSD(); + LLSD cert_info; + cert->getLLSD(cert_info); // convert all of the elements in the cert into // args for the xml dialog, so we have flexability to // display various parts of the cert by only modifying |