diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-21 15:14:39 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-21 15:14:39 -0500 |
| commit | 4652e26196ed43e3a2fdd5bbb2e6c4b6b8466719 (patch) | |
| tree | de6ce52d54764b0cf7d0c33d17d1cd7e71ffad1b /indra/newview/llfeaturemanager.cpp | |
| parent | 3571e83b6413e0c1050540a6cddeeaa7c6ca91c1 (diff) | |
| parent | 2d6228b4e0454c7d82770748eb572258c402319c (diff) | |
merge changes for storm-869
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) |