aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview')
-rw-r--r--linden/indra/newview/llfeaturemanager.cpp11
1 files changed, 1 insertions, 10 deletions
diff --git a/linden/indra/newview/llfeaturemanager.cpp b/linden/indra/newview/llfeaturemanager.cpp
index 35613b7..54da31b 100644
--- a/linden/indra/newview/llfeaturemanager.cpp
+++ b/linden/indra/newview/llfeaturemanager.cpp
@@ -250,11 +250,9 @@ BOOL LLFeatureManager::loadFeatureTables()
250 mTableVersion = version; 250 mTableVersion = version;
251 251
252 LLFeatureList *flp = NULL; 252 LLFeatureList *flp = NULL;
253 while (!file.eof() && file.good()) 253 while (file >> name)
254 { 254 {
255 char buffer[MAX_STRING]; /*Flawfinder: ignore*/ 255 char buffer[MAX_STRING]; /*Flawfinder: ignore*/
256
257 file >> name;
258 256
259 if (name.substr(0,2) == "//") 257 if (name.substr(0,2) == "//")
260 { 258 {
@@ -263,13 +261,6 @@ BOOL LLFeatureManager::loadFeatureTables()
263 continue; 261 continue;
264 } 262 }
265 263
266 if (name.empty())
267 {
268 // This is a blank line
269 file.getline(buffer, MAX_STRING);
270 continue;
271 }
272
273 if (name == "list") 264 if (name == "list")
274 { 265 {
275 if (flp) 266 if (flp)