diff options
author | Graham Linden <graham@lindenlab.com> | 2013-10-25 10:23:11 -0700 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2013-10-25 10:23:11 -0700 |
commit | 6480612a91b0e72fa746d294d8cade4f093c9372 (patch) | |
tree | 8d43a33390938c371fbbc5da804bc2def61a3cef /indra/newview/llfloaterpreference.cpp | |
parent | 2f0d9b78d28deba58988012a9940cb4f232ec2f9 (diff) | |
parent | ea1e1b0925b386cf83178539b8eae9e25c573548 (diff) |
Merge 3.6.9 ShareStorm
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) |