From 356fa49a74cbaeee64244d2d2f49a2e67fa219ba Mon Sep 17 00:00:00 2001
From: Aleric Inglewood
Date: Thu, 30 Sep 2010 16:46:37 +0200
Subject: RED-581: SNOW-796: Clicking 'Reset to default' in the Debug Settings
 floater doesn't update cached control values.

See http://redmine.imprudenceviewer.org/issues/581
---
 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 cff6863..5fe073c 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -60,6 +60,7 @@ Aleric Inglewood
 	SNOW-744
 	SNOW-751
 	SNOW-766
+	SNOW-796
 	SNOW-800
 	RED-552
 	RED-553
@@ -77,6 +78,7 @@ Aleric Inglewood
 	RED-577
 	RED-578
 	RED-579
+	RED-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