From 3604f987345e5432822ebbe28f96d2fafe8f3362 Mon Sep 17 00:00:00 2001
From: unknown <shyotl@gmail.com>
Date: Thu, 11 Nov 2010 00:26:17 -0600
Subject: [PATCH] Forgot something, apparently!

Also, Boolean + Real = bad.
---
 indra/llxml/llcontrol.cpp                      | 1 +
 indra/newview/app_settings/settings_ascent.xml | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/indra/llxml/llcontrol.cpp b/indra/llxml/llcontrol.cpp
index 7bd36f595..76fb3fc6f 100644
--- 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;
diff --git a/indra/newview/app_settings/settings_ascent.xml b/indra/newview/app_settings/settings_ascent.xml
index 05df2dd9b..c55daaa62 100644
--- 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>