Forgot something, apparently!

Also, Boolean + Real = bad.
2010-11-11 00:26:17 -06:00
parent 31cf29f51f
commit 3604f98734
2 changed files with 3 additions and 2 deletions
--- a/indra/llxml/llcontrol.cpp
+++ b/indra/llxml/llcontrol.cpp
@@ -1094,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;
--- a/indra/newview/app_settings/settings_ascent.xml
+++ b/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>