diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-20 20:48:16 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-20 20:48:16 -0500 |
| commit | 4f3953763de478b15ec6adc5c468b19a0e13bfe8 (patch) | |
| tree | df9926a8ef0446a44bbb07126dafb7345760fd8c /indra/newview/llfeaturemanager.cpp | |
| parent | f9b9c7a5816cf0b9627a4a50e73a663667937145 (diff) | |
| parent | c47ab36b20e102a918257e5fa5452f13bc55a393 (diff) | |
merge changes from viewer-beta
Diffstat (limited to 'indra/newview/llfeaturemanager.cpp')
| -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) |