diff --git a/doc/contributions.txt b/doc/contributions.txt index d533486936da15ce297a4995cd796782f7921a4a..0c83be89c22cf2a371cb65a04fee1d4f0eb03d71 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -80,6 +80,7 @@ Aleric Inglewood VWR-24252 VWR-24254 VWR-24261 + VWR-24315 SNOW-84 SNOW-477 SNOW-744 diff --git a/indra/newview/llfloatersettingsdebug.cpp b/indra/newview/llfloatersettingsdebug.cpp index 71882fbb839b91e2f250b4af29d29d19835e6a4d..07f5220ab7f8419cc50d5b0723c1d7f7e63a97dc 100644 --- a/indra/newview/llfloatersettingsdebug.cpp +++ b/indra/newview/llfloatersettingsdebug.cpp @@ -178,7 +178,7 @@ void LLFloaterSettingsDebug::onClickDefault() if (controlp) { - controlp->resetToDefault(); + controlp->resetToDefault(true); updateControl(controlp); } }