summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorRunitaiLinden <davep@lindenlab.com>2024-02-07 11:13:45 -0600
committerGitHub <noreply@github.com>2024-02-07 11:13:45 -0600
commit7b83294216d6d672d7a8657ebccd5ea29d7fd9c8 (patch)
tree0299ea6076cc510169accebc52dd13ba7ebf093e /indra/newview/skins/default/xui
parentb0c7dc653dc730f1f95aa95fc6df876dfe7b04a0 (diff)
parent4ddad4cd4365259d9ac90104c8fe946edabe025b (diff)
Merge pull request #748 from secondlife/geenz/mirror-masking
Add mirrors prototype UI + data model
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/floater_tools.xml47
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"