diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-21 07:20:54 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-21 07:20:54 -0500 |
| commit | 3015e4310564684702d5eb4c9be56c8870561706 (patch) | |
| tree | 0be58e77f8d5c11105f9582db2925bc36bbd47ac /indra/newview/llfeaturemanager.cpp | |
| parent | 1ae76ea43e3ad57ce58e1b432490de531e01dab3 (diff) | |
| parent | 5f997751fe4e55ad3c8a62bcfcdd91752f613903 (diff) | |
merge changes for storm-484
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) |