From 414428664c9b0914728fd126800b9fa87ff0679f Mon Sep 17 00:00:00 2001
From: Aleric Inglewood
Date: Thu, 30 Sep 2010 16:46:37 +0200
Subject: SNOW-796: Debug Settings 'Reset to default' partly broken. (#581)

Clicking 'Reset to default' in the Debug Settings floater doesn't update
cached control values.
---
 linden/doc/contributions.txt                    | 2 ++
 linden/indra/newview/llfloatersettingsdebug.cpp | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'linden')

diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index c3d5e59..a1e46fd 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -42,8 +42,10 @@ Alejandro Rosenthal
 Aleric Inglewood
 	SNOW-196
 	SNOW-408
+	SNOW-796
 	VWR-10759
 	VWR-10837
+	IMP-581
 Alissa Sabre
 	VWR-81
 	VWR-83
diff --git a/linden/indra/newview/llfloatersettingsdebug.cpp b/linden/indra/newview/llfloatersettingsdebug.cpp
index 2e414cb..fd6c47b 100644
--- a/linden/indra/newview/llfloatersettingsdebug.cpp
+++ b/linden/indra/newview/llfloatersettingsdebug.cpp
@@ -217,7 +217,7 @@ void LLFloaterSettingsDebug::onClickDefault(void* user_data)
 
 	if (controlp)
 	{
-		controlp->resetToDefault();
+		controlp->resetToDefault(true);
 		floaterp->updateControl(controlp);
 	}
 }
-- 
cgit v1.1