Remove duplicate code from merge

Cinders 2013-11-29 19:36:58 -07:00
parent 6c57e95ae4
commit 43ae80491d
1 changed files with 0 additions and 5 deletions

View File

@ -840,11 +840,6 @@ void LLFloaterPreference::cancel()
// hide spellchecker settings folder
LLFloaterReg::hideInstance("prefs_spellchecker");
// <FS:CR> STORM-1888
// hide spellchecker settings floater
LLFloaterReg::hideInstance("prefs_spellchecker");
// </FS:CR>
// cancel hardware menu
LLFloaterHardwareSettings* hardware_settings = LLFloaterReg::getTypedInstance<LLFloaterHardwareSettings>("prefs_hardware_settings");
if (hardware_settings)