diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-05-19 10:58:29 -0600 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-05-19 10:58:29 -0600 |
| commit | 9edfdf06cc50739682458ef54c62676f5882e949 (patch) | |
| tree | bfdbc2e3d13810b953d14c9557735a0548c7daf5 /indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml | |
| parent | 4488e03a93b17a2b0f30a5081e1e267b5c1c8a06 (diff) | |
| parent | ed3d9abdd01304b5a9708880d9b150fb6568256b (diff) | |
Merge branch 'master' into DRTVWR-510
Merge DRTVWR-460 changes in master (v 6.4.3) into the 510 branch.
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml | 16 |
1 files changed, 15 insertions, 1 deletions
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 4d9152e9a5..5aff7a5127 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -293,6 +293,21 @@ width="65"> 0 </text> +<text +type="string" +length="1" +follows="left|top" +height="16" +layout="topleft" +left_delta="68" +name="IndirectMaxComplexityLink" +mouse_opaque="false" +top_delta="0" +width="120"> +[https://community.secondlife.com/t5/Featured-News/Why-are-all-these-people-made-of-colored-jelly/ba-p/3031255 What's this?] +</text> + + <check_box control_name="AlwaysRenderFriends" height="16" @@ -345,7 +360,6 @@ function="Pref.PrefLoad" parameter="graphic"/> </button> - min_val="0.125" <button follows="top|left" |