diff options
author | Aleric Inglewood | 2010-09-30 16:46:37 +0200 |
---|---|---|
committer | Aleric Inglewood | 2010-09-30 16:46:37 +0200 |
commit | 356fa49a74cbaeee64244d2d2f49a2e67fa219ba (patch) | |
tree | 3f1521303187dd289359a459c05d99452d47886a /linden | |
parent | RED-579: SNOW-751: 'configure' with cmake 2.8 is extremely slow. (diff) | |
download | meta-impy-356fa49a74cbaeee64244d2d2f49a2e67fa219ba.zip meta-impy-356fa49a74cbaeee64244d2d2f49a2e67fa219ba.tar.gz meta-impy-356fa49a74cbaeee64244d2d2f49a2e67fa219ba.tar.bz2 meta-impy-356fa49a74cbaeee64244d2d2f49a2e67fa219ba.tar.xz |
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
Diffstat (limited to 'linden')
-rw-r--r-- | linden/doc/contributions.txt | 2 | ||||
-rw-r--r-- | linden/indra/newview/llfloatersettingsdebug.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
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 | |||
60 | SNOW-744 | 60 | SNOW-744 |
61 | SNOW-751 | 61 | SNOW-751 |
62 | SNOW-766 | 62 | SNOW-766 |
63 | SNOW-796 | ||
63 | SNOW-800 | 64 | SNOW-800 |
64 | RED-552 | 65 | RED-552 |
65 | RED-553 | 66 | RED-553 |
@@ -77,6 +78,7 @@ Aleric Inglewood | |||
77 | RED-577 | 78 | RED-577 |
78 | RED-578 | 79 | RED-578 |
79 | RED-579 | 80 | RED-579 |
81 | RED-581 | ||
80 | Alissa Sabre | 82 | Alissa Sabre |
81 | VWR-81 | 83 | VWR-81 |
82 | VWR-83 | 84 | 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 | } |