summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-09-09 16:04:45 -0400
committerOz Linden <oz@lindenlab.com>2013-09-09 16:04:45 -0400
commitd53f9366d0bca6f2c877d8162866076e6aa1229f (patch)
tree091eeda103a2d44adc11f4dcc46c5605f2e710d4 /indra
parentc4b070ae0011a0c2aa8dd3d01c5f3ad3ecbd3ec3 (diff)
parente1636448f8a5e0468eaf931ddb651ebc885d0a63 (diff)
merge changes for storm-1888
Diffstat (limited to 'indra')
-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 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)