summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorJonathan Yap <jhwelch@gmail.com>2015-01-25 06:24:44 -0500
committerJonathan Yap <jhwelch@gmail.com>2015-01-25 06:24:44 -0500
commitbdf55e9ea7106df2a61e352e7f87ad196f6b6f69 (patch)
treed1240b48203829c83014cf0a5fc4a8430033f89f /indra
parent6548f1c03d082b89fd6208a26778dd0d0762d850 (diff)
STORM-2082 Clear preset in use when resetting to hardware defaults
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llfloaterpreference.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 5938566b0a..17c93d792e 100755
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -778,6 +778,8 @@ void LLFloaterPreference::setHardwareDefaults()
{
LLFeatureManager::getInstance()->applyRecommendedSettings();
refreshEnabledGraphics();
+ gSavedSettings.setString("PresetGraphicActive", "");
+ LLPresetsManager::getInstance()->triggerChangeSignal();
LLTabContainer* tabcontainer = getChild<LLTabContainer>("pref core");
child_list_t::const_iterator iter = tabcontainer->getChildList()->begin();