diff -r b0bd26c5638a -r d9cafd3f44ce doc/contributions.txt
--- a/doc/contributions.txt	Thu Dec 30 13:11:44 2010 -0500
+++ b/doc/contributions.txt	Wed Dec 15 17:53:05 2010 +0100
@@ -79,6 +79,7 @@
 	VWR-24252
 	VWR-24254
 	VWR-24261
+	VWR-24315
 	SNOW-84
 	SNOW-477
 	SNOW-744
diff -r b0bd26c5638a -r d9cafd3f44ce indra/newview/llfloatersettingsdebug.cpp
--- a/indra/newview/llfloatersettingsdebug.cpp	Thu Dec 30 13:11:44 2010 -0500
+++ b/indra/newview/llfloatersettingsdebug.cpp	Wed Dec 15 17:53:05 2010 +0100
@@ -178,7 +178,7 @@
 
 	if (controlp)
 	{
-		controlp->resetToDefault();
+		controlp->resetToDefault(true);
 		updateControl(controlp);
 	}
 }