Minor cleanup and additional nullchecks.

2013-05-03 14:29:55 -05:00
parent 31eb3e8d24
commit 701fc87c05
3 changed files with 6 additions and 3 deletions
--- a/indra/llxml/llcontrol.cpp
+++ b/indra/llxml/llcontrol.cpp
@@ -933,9 +933,8 @@ U32 LLControlGroup::saveToFile(const std::string& filename, BOOL nondefault_only

 U32 LLControlGroup::loadFromFile(const std::string& filename, bool set_default_values, bool save_values)
 {
-	if(mIncludedFiles.find(filename) != mIncludedFiles.end())
+	if(!mIncludedFiles.insert(filename).second)
 		return 0; //Already included this file.
-	mIncludedFiles.insert(filename);

 	LLSD settings;
 	llifstream infile;