diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-10-17 13:05:08 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-10-17 13:05:08 -0700 |
| commit | 62999da4d076d0f2d36ee8bd1c4d98c5343663fe (patch) | |
| tree | 3811acc557ed4d28c9a6da49a0bb445ce5980dce /indra/newview/llfloaterpreference.cpp | |
| parent | 7ba4fc06f351dc09bf3cac6cc768a11302ce5598 (diff) | |
| parent | 3986a358db70d6282772c31884fd0fc814e59066 (diff) | |
Pull merge from oz_linden/336-snowstorm
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
| -rwxr-xr-x | indra/newview/llfloaterpreference.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 1969435ba1..87ae36716d 100755 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -618,9 +618,12 @@ void LLFloaterPreference::cancel() // hide translation settings floater LLFloaterReg::hideInstance("prefs_translation"); - // hide translation settings floater + // hide autoreplace settings floater LLFloaterReg::hideInstance("prefs_autoreplace"); + // hide spellchecker settings folder + LLFloaterReg::hideInstance("prefs_spellchecker"); + // cancel hardware menu LLFloaterHardwareSettings* hardware_settings = LLFloaterReg::getTypedInstance<LLFloaterHardwareSettings>("prefs_hardware_settings"); if (hardware_settings) |