More various small, old patches.

Updated source tree to include everything I did
up till 2010-11-09.

Still to add: IMP-590, IMP-701, IMP-734, IMP-735 and IMP-702.

indra/newview/llfeaturemanager.cpp

@@ -252,12 +252,10 @@ BOOL LLFeatureManager::loadFeatureTables()
 	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) == "//")
 		{
 			// This is a comment.
@@ -265,13 +263,6 @@ BOOL LLFeatureManager::loadFeatureTables()
 			continue;
 		}
 
-		if (name.empty())
-		{
-			// This is a blank line
-			file.getline(buffer, MAX_STRING);
-			continue;
-		}
-
 		if (name == "list")
 		{
 			if (flp)