diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-21 07:23:48 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-21 07:23:48 -0500 |
| commit | bb3be2c07f492577254ae9ace5675eb92d10f061 (patch) | |
| tree | 038a59de9284c528bf5c51d1dab851f23ecbc444 /indra/newview/llfeaturemanager.cpp | |
| parent | e3e1d9b4c3446ea87d1938d1cb0c4a5a9e5d448d (diff) | |
| parent | bca2b9a053b1358435b57e0c7a59866702644844 (diff) | |
merge changes for storm-715
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) |