diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2024-02-08 15:34:01 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-08 15:34:01 -0600 |
| commit | ba9bae05706982f982df8d615a28ac9c7c3c51fe (patch) | |
| tree | 4b688dcb22e6c65c7c8edde6e5a0d649ecd3751c /indra/newview/skins | |
| parent | 4f6e3acece507b8be66b76db5609bdaec41307d4 (diff) | |
| parent | c3d4f571aa5522e3028842c6d7caa977819a7393 (diff) | |
Merge pull request #715 from secondlife/materials_featurette/mirrors
Mirrors pre-release
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_tools.xml | 59 |
1 files changed, 43 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..72c78fec3d 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,16 +2559,52 @@ even though the user gets a free copy. name="Box" value="Box"/> </combo_box> + <check_box - height="16" - label="Dynamic" + 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" /> + + <text + bottom_delta="-8" + 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" /> - <spinner bottom_delta="19" + 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="17" decimal_digits="3" follows="left|top" height="16" |