diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-04-21 13:12:05 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-04-21 13:12:05 +0300 |
commit | a4b1c0330a6a8e43bf4c41c5b0c836bd1dee2268 (patch) | |
tree | 6d68d3e3f665d60fa946bd24a4b324b5e63339fb /indra/newview/skins/default/xui/pt/panel_settings_sky_sunmoon.xml | |
parent | a8df6762ff88458916397b9707f6954b2714e14d (diff) | |
parent | d7f1c88c35849e56f5b352f13c16a08467d1533b (diff) |
Merge branch 'master' into DRTVWR-482
# Conflicts:
# indra/newview/app_settings/shaders/class1/objects/previewV.glsl
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
Diffstat (limited to 'indra/newview/skins/default/xui/pt/panel_settings_sky_sunmoon.xml')
-rw-r--r-- | indra/newview/skins/default/xui/pt/panel_settings_sky_sunmoon.xml | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/pt/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/pt/panel_settings_sky_sunmoon.xml new file mode 100644 index 0000000000..fe6672b261 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_settings_sky_sunmoon.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Sol e Lua" name="panel_settings_sky_hbodies"> + <layout_stack> + <layout_panel name="sun_layout"> + <check_box label="Exibir baliza" name="sunbeacon"/> + </layout_panel> + <layout_panel> + <layout_stack> + <layout_panel name="moon_layout"> + <check_box label="Exibir baliza" name="moonbeacon"/> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> +</panel> |