diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-01 07:22:32 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-01 07:22:32 -0500 |
| commit | f0074f1002f36ad680ae04daf3f5e026dca31d54 (patch) | |
| tree | e55cad847d3dbd156b8386272d0778bdf952c33a /indra/newview/llfeaturemanager.cpp | |
| parent | 1aa01ad67fbe15ed43d8bb0bc7fb34a076a484b0 (diff) | |
| parent | ed308d15bf2f88f91687411cd92f6cc55b1e75b4 (diff) | |
merge changes back from beta branch
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) |