summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorRunitai Linden <davep@lindenlab.com>2022-01-25 13:36:53 -0600
committerRunitai Linden <davep@lindenlab.com>2022-01-25 13:36:53 -0600
commit817f764edc6d71727300bfaba533821a8d428950 (patch)
treeab6b87ffa47e42f9e8913194276f9988b4d2a590 /indra/newview/skins
parent7254795a77a78644eb8ec35cfa0a1af9cae4c3bc (diff)
parentb50de181623874ab799fdc31532dffe8f7bc610a (diff)
Merge branch 'DRTVWR-539' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-539
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml6
-rw-r--r--indra/newview/skins/default/xui/en/panel_performance_preferences.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml2
3 files changed, 5 insertions, 5 deletions
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 5978ae685a..65b96d3694 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
@@ -41,7 +41,7 @@
top_delta="16"
width="330">
<slider.mouse_down_callback
- function="Pref.MouseDown" />
+ function="Pref.AutoAdjustWarning" />
</slider>
<text
type="string"
@@ -186,7 +186,7 @@
function="Pref.UpdateIndirectMaxNonImpostors"
parameter="IndirectNonImpostorsText" />
<slider.mouse_down_callback
- function="Pref.MouseDown" />
+ function="Pref.AutoAdjustWarning" />
</slider>
<text
type="string"
@@ -856,7 +856,7 @@
name="ShadowDetail"
width="150">
<combo_box.mouse_down_callback
- function="Pref.MouseDown" />
+ function="Pref.AutoAdjustWarning" />
<combo_box.item
label="None"
name="0"
diff --git a/indra/newview/skins/default/xui/en/panel_performance_preferences.xml b/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
index 60792c2f7d..5fd6af24c1 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
@@ -208,7 +208,7 @@
left_pad="5"
width="250">
<slider.mouse_down_callback
- function="Pref.MouseDown" />
+ function="Pref.AutoAdjustWarning" />
</slider>
<text
type="string"
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 6e4a1a6859..f73149e77e 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -219,7 +219,7 @@
top_delta="40"
width="330">
<slider.mouse_down_callback
- function="Pref.MouseDown" />
+ function="Pref.AutoAdjustWarning" />
</slider>
<text
type="string"