diff options
| author | Aleric Inglewood <Aleric.Inglewood@gmail.com> | 2011-01-20 15:03:48 -0500 |
|---|---|---|
| committer | Aleric Inglewood <Aleric.Inglewood@gmail.com> | 2011-01-20 15:03:48 -0500 |
| commit | 9b341ec012a832bfcc98eb3f273ffc749ae95d47 (patch) | |
| tree | 58b610d3a12202b9a35f05ed02d105d925549cb2 /indra | |
| parent | e9c6800e231f85266521d36f0fba427420dd632a (diff) | |
VWR-24317: remove warning caused by reading the last line of the featuretable twice
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfeaturemanager.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index ca2ef5f5b8..4e16cc4217 100644 --- a/indra/newview/llfeaturemanager.cpp +++ b/indra/newview/llfeaturemanager.cpp @@ -290,11 +290,9 @@ BOOL LLFeatureManager::parseFeatureTable(std::string filename) mTableVersion = version; LLFeatureList *flp = NULL; - while (!file.eof() && file.good()) + while (file >> name) { char buffer[MAX_STRING]; /*Flawfinder: ignore*/ - - file >> name; if (name.substr(0,2) == "//") { @@ -303,13 +301,6 @@ BOOL LLFeatureManager::parseFeatureTable(std::string filename) continue; } - if (name.empty()) - { - // This is a blank line - file.getline(buffer, MAX_STRING); - continue; - } - if (name == "list") { if (flp) |