summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xdoc/contributions.txt1
-rwxr-xr-xindra/newview/llfloaterpreference.cpp5
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 9f77bbc846..f33cf36ec2 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -310,6 +310,7 @@ Cinder Roxley
OPEN-185
STORM-1703
STORM-1948
+ STORM-1888
STORM-1958
STORM-1952
STORM-1951
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 4ebe813be6..f48d99b651 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)