diff options
| -rw-r--r-- | indra/newview/llpanelvolume.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_tools.xml | 14 |
2 files changed, 18 insertions, 1 deletions
diff --git a/indra/newview/llpanelvolume.cpp b/indra/newview/llpanelvolume.cpp index e0d95c5386..6b5b691587 100644 --- a/indra/newview/llpanelvolume.cpp +++ b/indra/newview/llpanelvolume.cpp @@ -392,6 +392,11 @@ void LLPanelVolume::getState( ) bool probe_enabled = is_probe && editable && single_volume; + getChildView("Probe Update Type")->setVisible(LLPipeline::RenderMirrors); + getChildView("Probe Update Label")->setVisible(LLPipeline::RenderMirrors); + getChildView("Probe Dynamic")->setVisible(!LLPipeline::RenderMirrors); + + getChildView("Probe Dynamic")->setEnabled(probe_enabled); getChildView("Probe Update Type")->setEnabled(probe_enabled); getChildView("Probe Volume Type")->setEnabled(probe_enabled); getChildView("Probe Ambiance")->setEnabled(probe_enabled); diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 4f4216c85a..72c78fec3d 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -2559,7 +2559,19 @@ 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" /> + <text + bottom_delta="-8" type="string" length="1" follows="left|top" @@ -2592,7 +2604,7 @@ even though the user gets a free copy. name="Mirror" value="Mirror"/> </combo_box> - <spinner bottom_delta="19" + <spinner bottom_delta="17" decimal_digits="3" follows="left|top" height="16" |