summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterpreference.cpp
diff options
context:
space:
mode:
authorsimon <none@none>2013-10-24 16:45:38 -0700
committersimon <none@none>2013-10-24 16:45:38 -0700
commit26de32910f99e2522b8e10cf41415b1af2586d5b (patch)
tree57394ecbec4b9d7bc802e0a68c790f00f2b97887 /indra/newview/llfloaterpreference.cpp
parent93b3f1297ea5377257d14c5214790607e0b1af96 (diff)
parentea1e1b0925b386cf83178539b8eae9e25c573548 (diff)
Pull in viewer-release with fbc / snowstorm
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)