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

Merged in andreyl_productengine/391-blizzard-marchcat (pull request #23) 

MAINT-6174 FIXED Graphics parameters are wrong after closing the Advanced Graphics floater
master
Oz Linden 2016-03-09 23:12:16 -05:00
parent 27fd7fdee6 b6f6eeb02e
commit 6fb7c6b43c
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
indra/newview/llfloaterpreference.cpp
View File

@ -824,6 +824,13 @@ void LLFloaterPreference::updateShowFavoritesCheckbox(bool val)
void LLFloaterPreference::setHardwareDefaults()
{
std::string preset_graphic_active = gSavedSettings.getString("PresetGraphicActive");
if (!preset_graphic_active.empty())
{
saveGraphicsPreset(preset_graphic_active);
saveSettings(); // save here to be able to return to the previous preset by Cancel
}
LLFeatureManager::getInstance()->applyRecommendedSettings();
// reset indirects before refresh because we may have changed what they control
@ -2478,6 +2485,12 @@ void LLPanelPreferenceGraphics::onPresetsListChange()
{
resetDirtyChilds();
setPresetText();
LLFloaterPreference* instance = LLFloaterReg::findTypedInstance<LLFloaterPreference>("preferences");
if (instance && !gSavedSettings.getString("PresetGraphicActive").empty())
{
instance->saveSettings(); //make cancel work correctly after changing the preset
}
}
void LLPanelPreferenceGraphics::setPresetText()
@ -2486,13 +2499,17 @@ void LLPanelPreferenceGraphics::setPresetText()
std::string preset_graphic_active = gSavedSettings.getString("PresetGraphicActive");
if (hasDirtyChilds() && !preset_graphic_active.empty())
if (!preset_graphic_active.empty() && preset_graphic_active != preset_text->getText())
{
LLFloaterPreference* instance = LLFloaterReg::findTypedInstance<LLFloaterPreference>("preferences");
if (instance)
{
instance->saveGraphicsPreset(preset_graphic_active);
}
}
if (hasDirtyChilds() && !preset_graphic_active.empty())
{
gSavedSettings.setString("PresetGraphicActive", "");
preset_graphic_active.clear();
// This doesn't seem to cause an infinite recursion. This trigger is needed to cause the pulldown

4
indra/newview/llfloaterpreference.h
View File

@ -125,12 +125,10 @@ protected:
// updates click/double-click action controls depending on values from settings.xml
void updateClickActionControls();
public:
// This function squirrels away the current values of the controls so that
// cancel() can restore them.
void saveSettings();
public:
void setCacheLocation(const LLStringExplicit& location);