Dear GCC:

:( Sincerely, Shyotl
2010-11-10 19:52:14 -06:00
parent f357842265
commit 31cf29f51f
2 changed files with 15 additions and 14 deletions
--- a/indra/llxml/llcontrol.cpp
+++ b/indra/llxml/llcontrol.cpp
@@ -303,11 +303,8 @@ LLPointer<LLControlVariable> LLControlGroup::getControl(const std::string& name)
 			gSettingsCallMap.push_back(std::pair<std::string, U32>(name.c_str(),1));
 	}
 #endif //PROF_CTRL_CALLS
-	//return iter == mNameTable.end() ? LLPointer<LLControlVariable>() : iter->second;
-
-	LLControlVariable *pFoundVar = (iter != mNameTable.end()) ? iter->second : NULL;
-	if(pFoundVar)
-		return pFoundVar->getCOAActive();
+	if(iter != mNameTable.end())
+		return iter->second->getCOAActive();
 	else
 		return LLPointer<LLControlVariable>();
 }