diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-06-09 19:43:21 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-06-09 19:43:21 -0500 |
| commit | 03d85bfb33f53e658256d8bedcf0b4262226cf90 (patch) | |
| tree | 9de858b1d367fc02725c735d404d7bfec4471847 /indra/newview/skins/default/xui | |
| parent | bc85cc300d32c543ab80204a9b2fcf54b4b11935 (diff) | |
SL-17573 Add "dynamic" checkbox, also followup on SL-17551 and do "Select Invisible Objects" checkbox instead of "Select Reflection Probes"
Diffstat (limited to 'indra/newview/skins/default/xui')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_tools.xml | 17 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 10 |
2 files changed, 18 insertions, 9 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index ae4eb64264..449bf8fa3a 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -2317,7 +2317,7 @@ even though the user gets a free copy. left="10" name="Light Checkbox Ctrl" tool_tip="Causes object to emit light" - top_pad="15" + top_pad="10" width="60" /> <color_swatch can_apply_immediately="true" @@ -2425,16 +2425,16 @@ even though the user gets a free copy. label="Reflection Probe" layout="topleft" left="10" - name="Reflection Probe Checkbox Ctrl" + name="Reflection Probe" tool_tip="Adjusts how objects within this volume receive reflections when PBR is enabled" - top_pad="15" + top_pad="10" width="60" /> <combo_box height="19" top_delta="0" left="144" follows="left|top" - name="Probe Volume Type Ctrl" + name="Probe Volume Type" tool_tip="Choose the probe influence volume" width="108"> <combo_box.item @@ -2446,6 +2446,15 @@ even though the user gets a free copy. name="Box" value="Box"/> </combo_box> + <check_box + height="16" + label="Dynamic" + layout="topleft" + left="10" + name="Probe Dynamic" + tool_tip="When enabled, Avatars will appear in reflections within this probe's influence volume." + bottom_delta="19" + width="60" /> <spinner bottom_delta="19" decimal_digits="3" follows="left|top" diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 159b9aebd0..7a5c2099eb 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -1418,13 +1418,13 @@ function="World.EnvPreset" parameter="movable" /> </menu_item_check> <menu_item_check - label="Select Reflection Probes" - name="Select Reflection Probes"> + label="Select Invisible Objects" + name="Select Invisible Objects"> <menu_item_check.on_check - control="SelectReflectionProbes" /> + control="SelectInvisibleObjects" /> <menu_item_check.on_click - function="Tools.SelectReflectionProbes" - parameter="probes" /> + function="Tools.SelectInvisibleObjects" + parameter="invisible" /> </menu_item_check> <menu_item_check label="Select By Surrounding" |