diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-09-09 16:04:45 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-09-09 16:04:45 -0400 |
| commit | d53f9366d0bca6f2c877d8162866076e6aa1229f (patch) | |
| tree | 091eeda103a2d44adc11f4dcc46c5605f2e710d4 | |
| parent | c4b070ae0011a0c2aa8dd3d01c5f3ad3ecbd3ec3 (diff) | |
| parent | e1636448f8a5e0468eaf931ddb651ebc885d0a63 (diff) | |
merge changes for storm-1888
| -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 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) |