diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2024-02-07 11:20:36 -0600 |
|---|---|---|
| committer | RunitaiLinden <davep@lindenlab.com> | 2024-02-07 11:20:36 -0600 |
| commit | e6e24556a72286ed42a9ef2724ea415f4482896b (patch) | |
| tree | 51b3d59e450b41a8008b3a96e66709d8daeb9dc1 /indra/newview/skins/default | |
| parent | 78cc23f89ce01eff6531d4130bdb8016296043a6 (diff) | |
| parent | 7b83294216d6d672d7a8657ebccd5ea29d7fd9c8 (diff) | |
Merge branch 'materials_featurette/mirrors' of https://github.com/secondlife/viewer into materials_featurette/mirrors
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_tools.xml | 47 |
1 files changed, 31 insertions, 16 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 510351b471..4f4216c85a 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -2412,15 +2412,6 @@ even though the user gets a free copy. width="278" /> <check_box height="16" - label="Mirror" - layout="topleft" - left="10" - name="Mirror Checkbox Ctrl" - tool_tip="Causes object to be a mirror" - top_pad="8" - width="60" /> - <check_box - height="16" label="Light" layout="topleft" left="10" @@ -2568,15 +2559,39 @@ even though the user gets a free copy. name="Box" value="Box"/> </combo_box> - <check_box - height="16" - label="Dynamic" + <text + type="string" + length="1" + follows="left|top" + height="10" 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" /> + name="Probe Update Label" + text_readonly_color="LabelDisabledColor" + width="100"> + Probe Update + </text> + <combo_box + height="19" + top_delta="0" + left="144" + follows="left|top" + name="Probe Update Type" + tool_tip="Determines how the probe updates. Static updates the slowest and without avatars. Dynamic updates more frequently, with avatars visible in the probes. Mirror turns this probe into a realtime planar projected mirror probe, but does not calculate ambiance." + width="108"> + <combo_box.item + label="Static" + name="Static" + value="Static" /> + <combo_box.item + label="Dynamic" + name="Dynamic" + value="Dynamic"/> + <combo_box.item + label="Mirror" + name="Mirror" + value="Mirror"/> + </combo_box> <spinner bottom_delta="19" decimal_digits="3" follows="left|top" |