diff options
| author | Cinders <cinder@cinderblocks.biz> | 2013-05-22 21:43:32 -0600 |
|---|---|---|
| committer | Cinders <cinder@cinderblocks.biz> | 2013-05-22 21:43:32 -0600 |
| commit | 4cf16ffdfbb166fbb3fcf1d7950ca1a240c94ca1 (patch) | |
| tree | f08a7f3b618f5ace30dfbcbcdd21290cc115c23e | |
| parent | 0ebcb7e3fd1452d42b5ca48139f99a4fd632d235 (diff) | |
STORM-1888: Hide Spellchecker Settings floater when Preferences floater is closed
Bonus: Correct the immediately preceding auto replace comment
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rwxr-xr-x | indra/newview/llfloaterpreference.cpp | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 09c0d01b11..28de94f186 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -301,6 +301,7 @@ Ciaran Laval Cinder Roxley BUG-2326 STORM-1703 + STORM-1888 Clara Young Coaldust Numbers VWR-1095 diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index bbf88060c1..fde98aae9a 100755 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -617,9 +617,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) |