From 75d3bc4d6160e0d535067cfb7bbf86f948995384 Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Fri, 11 Sep 2015 11:11:28 +0300 Subject: MAINT-5537 FIXED Advanced Graphics Preferences sliders are incorrect if you click Cancel rather than OK --- indra/newview/llfloaterpreference.cpp | 5 +++++ indra/newview/llfloaterpreference.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 38c9ba2850..898e5d5e1f 100755 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -2572,6 +2572,11 @@ LLFloaterPreferenceProxy::LLFloaterPreferenceProxy(const LLSD& key) mCommitCallbackRegistrar.add("Proxy.Change", boost::bind(&LLFloaterPreferenceProxy::onChangeSocksSettings, this)); } +void LLFloaterPreferenceGraphicsAdvanced::onOpen(const LLSD& key) +{ + refresh(); +} + LLFloaterPreferenceProxy::~LLFloaterPreferenceProxy() { } diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h index 9730722558..651b8d8563 100755 --- a/indra/newview/llfloaterpreference.h +++ b/indra/newview/llfloaterpreference.h @@ -270,7 +270,7 @@ class LLFloaterPreferenceGraphicsAdvanced : public LLFloater public: LLFloaterPreferenceGraphicsAdvanced(const LLSD& key); ~LLFloaterPreferenceGraphicsAdvanced(); - + void onOpen(const LLSD& key); void disableUnavailableSettings(); void refreshEnabledGraphics(); void refreshEnabledState(); -- cgit v1.2.3