livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge changes for storm-1888

meow-7.2.2
Oz Linden 2013-09-09 16:04:45 -04:00
parent c4b070ae00 e1636448f8
commit d53f9366d0
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -310,6 +310,7 @@ Cinder Roxley
OPEN-185
STORM-1703
STORM-1948
STORM-1888
STORM-1958
STORM-1952
STORM-1951

5
indra/newview/llfloaterpreference.cpp
View File

@ -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)