summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterpreference.cpp
diff options
context:
space:
mode:
authorsimon <none@none>2013-10-23 14:14:36 -0700
committersimon <none@none>2013-10-23 14:14:36 -0700
commit64c5afa196d1692cd0823ccd555f1f7bb32f529d (patch)
treec0ee113ee6aae7009446756f4c10188134ea7179 /indra/newview/llfloaterpreference.cpp
parent0d0a8d841cab3fbb569a7382b78b0b4fb485eefb (diff)
parentea1e1b0925b386cf83178539b8eae9e25c573548 (diff)
Merge latest viewer-release with FBC
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
-rwxr-xr-xindra/newview/llfloaterpreference.cpp5
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)