From 73d1b4f79ccc064ed84e66d1a55e7cc3823aa8b2 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Mon, 26 Nov 2012 13:22:25 -0600 Subject: MAINT-1950 Add hashmarks to detail slider and put "Ultra" back in setGraphicsLevel Reviewed by Simon --- indra/newview/llfeaturemanager.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/newview/llfeaturemanager.cpp') diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index 6f11d4d4ca..b211027d54 100644 --- a/indra/newview/llfeaturemanager.cpp +++ b/indra/newview/llfeaturemanager.cpp @@ -720,7 +720,9 @@ void LLFeatureManager::setGraphicsLevel(S32 level, bool skipFeatures) maskFeatures("High"); maskFeatures("Class5"); break; - + case 6: + maskFeatures("Ultra"); + break; default: maskFeatures("Low"); maskFeatures("Class0"); -- cgit v1.2.3 From 1f2b88803e83e2f35d8ed658783d6c4c3110c088 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Tue, 4 Dec 2012 16:10:15 -0600 Subject: MAINT-1953 Run through viewer stats and update GPU table with missing entries and new expected OpenGL versions --- indra/newview/llfeaturemanager.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'indra/newview/llfeaturemanager.cpp') diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index 6f11d4d4ca..36bf5a6842 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("\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*/ -- cgit v1.2.3