diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-02-21 15:08:40 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-02-21 15:08:40 -0500 |
| commit | d12f3d15d986231cbd2e3714ce39247b2b6bc30f (patch) | |
| tree | eedcbca5622e39b2a9fc65c07005b7d3963387c8 /indra/newview/skins/default/xui/en | |
| parent | c598094d153c36b7b1c5504c460e3e4a750e947e (diff) | |
| parent | 3cf8a1ce6e81c30cf7231a5ab045bbc45c6757e2 (diff) | |
merge impostor and visual muting changes
Diffstat (limited to 'indra/newview/skins/default/xui/en')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml | 22 |
1 files changed, 11 insertions, 11 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 01a5e36ab0..9d8f2215aa 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 @@ -130,24 +130,24 @@ </text> <slider - control_name="MaximumARC" + control_name="IndirectMaxComplexity" follows="left|top" height="16" initial_value="101" increment="1" - label="Maximum ARC:" + label="Maximum Complexity:" label_width="185" layout="topleft" left="30" min_val="1" max_val="101" - name="MaximumARC" + name="IndirectMaxComplexity" show_text="false" top_delta="16" width="300"> <slider.commit_callback - function="Pref.UpdateSliderText" - parameter="MaximumARCText" /> + function="Pref.UpdateIndirectMaxComplexity" + parameter="IndirectMaxComlexityText" /> </slider> <text type="string" @@ -158,13 +158,13 @@ top_delta="0" left_delta="304" text_readonly_color="LabelDisabledColor" - name="MaximumARCText" + name="IndirectMaxComplexityText" width="65"> 0 </text> <slider - control_name="RenderAvatarMaxVisible" + control_name="IndirectMaxNonImpostors" decimal_digits="0" follows="left|top" height="16" @@ -176,13 +176,13 @@ left="30" min_val="1" max_val="66" - name="MaxNumberAvatarDrawn" + name="IndirectMaxNonImpostors" show_text="false" top_delta="16" width="300"> <slider.commit_callback - function="Pref.UpdateSliderText" - parameter="ImpostorsText" /> + function="Pref.UpdateIndirectMaxNonImpostors" + parameter="IndirectNonImpostorsText" /> </slider> <text type="string" @@ -193,7 +193,7 @@ top_delta="0" left_delta="304" text_readonly_color="LabelDisabledColor" - name="ImpostorsText" + name="IndirectMaxNonImpostorsText" width="65"> 0 </text> |