summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatersettingsdebug.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-02-01 07:22:32 -0500
committerOz Linden <oz@lindenlab.com>2011-02-01 07:22:32 -0500
commitf0074f1002f36ad680ae04daf3f5e026dca31d54 (patch)
treee55cad847d3dbd156b8386272d0778bdf952c33a /indra/newview/llfloatersettingsdebug.cpp
parent1aa01ad67fbe15ed43d8bb0bc7fb34a076a484b0 (diff)
parented308d15bf2f88f91687411cd92f6cc55b1e75b4 (diff)
merge changes back from beta branch
Diffstat (limited to 'indra/newview/llfloatersettingsdebug.cpp')
-rw-r--r--indra/newview/llfloatersettingsdebug.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloatersettingsdebug.cpp b/indra/newview/llfloatersettingsdebug.cpp
index 71882fbb83..07f5220ab7 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);
}
}