summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--indra/newview/llfloaterpreference.cpp4
-rw-r--r--indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml12
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml4
3 files changed, 10 insertions, 10 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 8165207dd0..d11e5e44d2 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -407,7 +407,7 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)
mCommitCallbackRegistrar.add("Pref.HardwareDefaults", boost::bind(&LLFloaterPreference::setHardwareDefaults, this));
mCommitCallbackRegistrar.add("Pref.AvatarImpostorsEnable", boost::bind(&LLFloaterPreference::onAvatarImpostorsEnable, this));
mCommitCallbackRegistrar.add("Pref.UpdateIndirectMaxComplexity", boost::bind(&LLFloaterPreference::updateMaxComplexity, this));
- mCommitCallbackRegistrar.add("Pref.VertexShaderEnable", boost::bind(&LLFloaterPreference::onRenderOptionEnable, this));
+ mCommitCallbackRegistrar.add("Pref.RenderOptionUpdate", boost::bind(&LLFloaterPreference::onRenderOptionEnable, this));
mCommitCallbackRegistrar.add("Pref.WindowedMod", boost::bind(&LLFloaterPreference::onCommitWindowedMode, this));
mCommitCallbackRegistrar.add("Pref.UpdateSliderText", boost::bind(&LLFloaterPreference::refreshUI,this));
mCommitCallbackRegistrar.add("Pref.QualityPerformance", boost::bind(&LLFloaterPreference::onChangeQuality, this, _2));
@@ -2873,7 +2873,7 @@ void LLPanelPreferenceGraphics::setHardwareDefaults()
LLFloaterPreferenceGraphicsAdvanced::LLFloaterPreferenceGraphicsAdvanced(const LLSD& key)
: LLFloater(key)
{
- mCommitCallbackRegistrar.add("Pref.VertexShaderEnable", boost::bind(&LLFloaterPreferenceGraphicsAdvanced::onRenderOptionEnable, this));
+ mCommitCallbackRegistrar.add("Pref.RenderOptionUpdate", boost::bind(&LLFloaterPreferenceGraphicsAdvanced::onRenderOptionEnable, this));
mCommitCallbackRegistrar.add("Pref.UpdateIndirectMaxNonImpostors", boost::bind(&LLFloaterPreferenceGraphicsAdvanced::updateMaxNonImpostors,this));
mCommitCallbackRegistrar.add("Pref.UpdateIndirectMaxComplexity", boost::bind(&LLFloaterPreferenceGraphicsAdvanced::updateMaxComplexity,this));
}
diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
index f06377f51a..ce219069e7 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
@@ -609,7 +609,7 @@
top_delta="16"
width="300">
<check_box.commit_callback
- function="Pref.VertexShaderEnable" />
+ function="Pref.RenderOptionUpdate" />
</check_box>
<check_box
@@ -685,7 +685,7 @@
top_delta="16"
width="280">
<check_box.commit_callback
- function="Pref.VertexShaderEnable" />
+ function="Pref.RenderOptionUpdate" />
</check_box>
<check_box
@@ -753,7 +753,7 @@
top_delta="16"
width="280">
<check_box.commit_callback
- function="Pref.VertexShaderEnable" />
+ function="Pref.RenderOptionUpdate" />
</check_box>
<slider
@@ -802,7 +802,7 @@
top_delta="16"
width="260">
<check_box.commit_callback
- function="Pref.VertexShaderEnable" />
+ function="Pref.RenderOptionUpdate" />
</check_box>
<check_box
@@ -816,7 +816,7 @@
top_delta="16"
width="240">
<check_box.commit_callback
- function="Pref.VertexShaderEnable" />
+ function="Pref.RenderOptionUpdate" />
</check_box>
<check_box
@@ -830,7 +830,7 @@
top_delta="16"
width="240">
<check_box.commit_callback
- function="Pref.VertexShaderEnable" />
+ function="Pref.RenderOptionUpdate" />
</check_box>
<!--
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 4692a226d9..4d9152e9a5 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -242,7 +242,7 @@
top_delta="24"
width="280">
<check_box.commit_callback
- function="Pref.VertexShaderEnable" />
+ function="Pref.RenderOptionUpdate" />
</check_box>
<check_box
@@ -256,7 +256,7 @@
top_delta="24"
width="256">
<check_box.commit_callback
- function="Pref.VertexShaderEnable" />
+ function="Pref.RenderOptionUpdate" />
</check_box>
<slider