summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2015-09-11 11:11:28 +0300
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2015-09-11 11:11:28 +0300
commit75d3bc4d6160e0d535067cfb7bbf86f948995384 (patch)
treef12fad266ce110ed404dbbe6a3a70412917fb22d /indra/newview
parent5c7e76ef60cfddcdff5efa6304aa2c1ebcebc49c (diff)
MAINT-5537 FIXED Advanced Graphics Preferences sliders are incorrect if you click Cancel rather than OK
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llfloaterpreference.cpp5
-rwxr-xr-xindra/newview/llfloaterpreference.h2
2 files changed, 6 insertions, 1 deletions
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();