summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/floater_camera.xml
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2017-02-02 15:49:16 -0500
committerOz Linden <oz@lindenlab.com>2017-02-02 15:49:16 -0500
commit1925fd2b8b9216e5d9388e6a0c077c99aa782cad (patch)
tree2507c9889eb825302f7c3f1650b85e6208b04e4e /indra/newview/skins/default/xui/en/floater_camera.xml
parent7f544db197fcaa8a697ee9d9694d11b297a20266 (diff)
parent080744d8990e6b18a80858803a20a5ec87020d82 (diff)
merge changes for 5.0.1-release
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_camera.xml')
-rw-r--r--indra/newview/skins/default/xui/en/floater_camera.xml5
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index 521389d7b3..72a7b5540c 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -43,13 +43,11 @@
name="controls"
width="226">
<panel
- color="Transparent"
follows="all"
height="102"
layout="topleft"
left="8"
name="preset_views_list"
- opaque="true"
top="24"
width="212"
visible="false">
@@ -100,14 +98,11 @@
</panel_camera_item>
</panel>
<panel
- color="Transparent"
follows="all"
height="68"
- item_pad="4"
layout="topleft"
left="8"
name="camera_modes_list"
- opaque="true"
top="24"
width="212"
visible="false">