diff -r b0bd26c5638a -r cd623e0838c8 indra/newview/llfeaturemanager.cpp
--- a/indra/newview/llfeaturemanager.cpp	Wed Dec 15 18:57:55 2010 +0100
+++ b/indra/newview/llfeaturemanager.cpp	Wed Dec 15 19:25:52 2010 +0100
@@ -290,11 +290,9 @@
 	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 @@
 			continue;
 		}
 
-		if (name.empty())
-		{
-			// This is a blank line
-			file.getline(buffer, MAX_STRING);
-			continue;
-		}
-
 		if (name == "list")
 		{
 			if (flp)