Merge Shyotl

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 : (LLPointer<LLControlVariable>) NULL;
-	if(pFoundVar)
-		return pFoundVar->getCOAActive();
+	if(iter != mNameTable.end())
+		return iter->second->getCOAActive();
 	else
 		return LLPointer<LLControlVariable>();
 }
@@ -1097,6 +1094,7 @@ U32 LLControlGroup::loadFromFile(const std::string& filename, bool set_default_v
 {
 	if(mIncludedFiles.find(filename) != mIncludedFiles.end())
 		return 0; //Already included this file.
+	mIncludedFiles.insert(filename);
 
 	std::string name;
 	LLSD settings;

indra/llxml/llcontrol.h

@@ -400,7 +400,8 @@ private:
 template <> inline void LLCachedControl<LLColor4>::setValue(const LLSD& newvalue)
 {
 	if(this->mControl->isType(TYPE_COL4U))
-		this->mCachedValue.set(LLColor4U(newvalue)); //a color4u LLSD cannot be auto-converted to color4.. so do it manually.
+		//a color4u LLSD cannot be auto-converted to color4.. so do it manually.
+		this->mCachedValue.set(LLColor4U(newvalue)); 
 	else
 		this->mCachedValue = (const LLColor4 &)newvalue;
 }

indra/newview/app_settings/settings_ascent.xml

@@ -166,7 +166,7 @@
 			<key>Type</key>
 			<string>Boolean</string>
 			<key>Value</key>
-			<real>0</real>
+			<integer>0</integer>
 		</map>
 		<key>AscentUseStatusColors</key>
 		<map>
@@ -177,7 +177,7 @@
 			<key>Type</key>
 			<string>Boolean</string>
 			<key>Value</key>
-			<real>0</real>
+			<integer>0</integer>
 		</map>
 		<key>AscentAvatarXModifier</key>
 		<map>