aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
authorAleric Inglewood2010-09-30 16:46:37 +0200
committerJacek Antonelli2010-10-03 19:58:02 -0500
commit414428664c9b0914728fd126800b9fa87ff0679f (patch)
tree0b4f69eee87590eded4652e0b7366e828f7c34f8 /linden
parentSNOW-422: Imprudence doesn't compile with g++ 4.4.x (#562) (diff)
downloadmeta-impy-414428664c9b0914728fd126800b9fa87ff0679f.zip
meta-impy-414428664c9b0914728fd126800b9fa87ff0679f.tar.gz
meta-impy-414428664c9b0914728fd126800b9fa87ff0679f.tar.bz2
meta-impy-414428664c9b0914728fd126800b9fa87ff0679f.tar.xz
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.
Diffstat (limited to 'linden')
-rw-r--r--linden/doc/contributions.txt2
-rw-r--r--linden/indra/newview/llfloatersettingsdebug.cpp2
2 files changed, 3 insertions, 1 deletions
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
42Aleric Inglewood 42Aleric Inglewood
43 SNOW-196 43 SNOW-196
44 SNOW-408 44 SNOW-408
45 SNOW-796
45 VWR-10759 46 VWR-10759
46 VWR-10837 47 VWR-10837
48 IMP-581
47Alissa Sabre 49Alissa Sabre
48 VWR-81 50 VWR-81
49 VWR-83 51 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)
217 217
218 if (controlp) 218 if (controlp)
219 { 219 {
220 controlp->resetToDefault(); 220 controlp->resetToDefault(true);
221 floaterp->updateControl(controlp); 221 floaterp->updateControl(controlp);
222 } 222 }
223} 223}