From 42604a1080d2080be748bca80ff84fec24024c63 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Thu, 20 Jan 2011 14:35:04 -0500
Subject: VWR-24315: update cached control values when resetting debug setting
 to default

---
 doc/contributions.txt                    | 1 +
 indra/newview/llfloatersettingsdebug.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/contributions.txt b/doc/contributions.txt
index d533486936..0c83be89c2 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -80,6 +80,7 @@ Aleric Inglewood
 	VWR-24252
 	VWR-24254
 	VWR-24261
+	VWR-24315
 	SNOW-84
 	SNOW-477
 	SNOW-744
diff --git a/indra/newview/llfloatersettingsdebug.cpp b/indra/newview/llfloatersettingsdebug.cpp
index 71882fbb83..07f5220ab7 100644
--- a/indra/newview/llfloatersettingsdebug.cpp
+++ b/indra/newview/llfloatersettingsdebug.cpp
@@ -178,7 +178,7 @@ void LLFloaterSettingsDebug::onClickDefault()
 
 	if (controlp)
 	{
-		controlp->resetToDefault();
+		controlp->resetToDefault(true);
 		updateControl(controlp);
 	}
 }
-- 
cgit v1.2.3