diff options
| author | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-02-28 21:53:34 +0000 |
|---|---|---|
| committer | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-02-28 21:53:34 +0000 |
| commit | aba5777d747d67db43e03772d30cb50d18d1a5d5 (patch) | |
| tree | 10e4a3248143f709643bcc50490e982f93be30f7 /indra/newview/llfeaturemanager.cpp | |
| parent | 72270213f5eebd019b10bdd6ec15020ba3d2ecf5 (diff) | |
| parent | e2e63598d40109d01e0311ce1444d3feedffcf66 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llfeaturemanager.cpp')
| -rw-r--r-- | indra/newview/llfeaturemanager.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index ce949fa1bf..bc96ee00f7 100644 --- a/indra/newview/llfeaturemanager.cpp +++ b/indra/newview/llfeaturemanager.cpp @@ -324,18 +324,19 @@ bool LLFeatureManager::parseFeatureTable(std::string filename) // Check file version file >> name; - file >> version; if (name != "version") { LL_WARNS("RenderInit") << filename << " does not appear to be a valid feature table!" << LL_ENDL; return false; } + file >> version; mTableVersion = version; + LL_INFOS("RenderInit") << "Found feature table version " << version << LL_ENDL; LLFeatureList *flp = NULL; bool parse_ok = true; - while (file >> name && parse_ok) + while (parse_ok && file >> name ) { char buffer[MAX_STRING]; /*Flawfinder: ignore*/ @@ -345,7 +346,7 @@ bool LLFeatureManager::parseFeatureTable(std::string filename) file.getline(buffer, MAX_STRING); continue; } - + if (name == "list") { LL_DEBUGS("RenderInit") << "Before new list" << std::endl; @@ -368,7 +369,7 @@ bool LLFeatureManager::parseFeatureTable(std::string filename) } else { - LL_WARNS("RenderInit") << "Overriding mask " << name << ", this is invalid!" << LL_ENDL; + LL_WARNS("RenderInit") << "Overriding mask '" << name << "'; this is invalid!" << LL_ENDL; parse_ok = false; } } |