diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-12-12 13:16:45 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-12-12 13:16:45 -0800 |
| commit | a88de5d45fe698bf9193659a677927c96c319ad6 (patch) | |
| tree | 00f2fc46b6f012e2acf7410666902b723938347f /indra/newview/llfeaturemanager.cpp | |
| parent | 4c20cc3e46d0392c63ecec304858493c8f59059b (diff) | |
| parent | 78b7a4b37c4762ea9503c1da0f79ab8fc412c2b9 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-chui-stinson-merge.
Diffstat (limited to 'indra/newview/llfeaturemanager.cpp')
| -rw-r--r-- | indra/newview/llfeaturemanager.cpp | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index 6f11d4d4ca..24a27c5146 100644 --- a/indra/newview/llfeaturemanager.cpp +++ b/indra/newview/llfeaturemanager.cpp @@ -419,7 +419,7 @@ void LLFeatureManager::parseGPUTable(std::string filename) // setup the tokenizer std::string buf(buffer); - std::string cls, label, expr, supported; + std::string cls, label, expr, supported, stats_based, expected_gl_version; boost_tokenizer tokens(buf, boost::char_separator<char>("\t\n")); boost_tokenizer::iterator token_iter = tokens.begin(); @@ -440,6 +440,14 @@ void LLFeatureManager::parseGPUTable(std::string filename) { supported = *token_iter++; } + if (token_iter != tokens.end()) + { + stats_based = *token_iter++; + } + if (token_iter != tokens.end()) + { + expected_gl_version = *token_iter++; + } if (label.empty() || expr.empty() || cls.empty() || supported.empty()) { @@ -450,7 +458,9 @@ void LLFeatureManager::parseGPUTable(std::string filename) json << "{'label' : '" << label << "',\n" << "'regexp' : '" << expr << "',\n" << "'class' : '" << cls << "',\n" << - "'supported' : '" << supported << "'\n},\n"; + "'supported' : '" << supported << "',\n" << + "'stats_based' : " << stats_based << ",\n" << + "'gl_version' : " << expected_gl_version << "\n},\n"; #endif for (U32 i = 0; i < expr.length(); i++) /*Flawfinder: ignore*/ @@ -720,7 +730,9 @@ void LLFeatureManager::setGraphicsLevel(S32 level, bool skipFeatures) maskFeatures("High"); maskFeatures("Class5"); break; - + case 6: + maskFeatures("Ultra"); + break; default: maskFeatures("Low"); maskFeatures("Class0"); |