summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-09-08 22:37:14 -0700
committerRichard Linden <none@none>2011-09-08 22:37:14 -0700
commit8d64e5d831dddc8a5f5c25ed79f79c730c0947f1 (patch)
tree12e8d19c066c64cfad65d0fc2fa2c2d967762c83 /indra/newview/skins
parentf2acd554bcf8326824acc23457a38a70021b0026 (diff)
parent72913ddf4987cae5970741c75f4306815acc5afb (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/floater_camera.xml9
1 files changed, 2 insertions, 7 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index 527d2fab94..da2be18db6 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -63,8 +63,7 @@
width="212"
visible="false">
<panel_camera_item
- name="front_view"
- top="0">
+ name="front_view">
<panel_camera_item.mousedown_callback
function="CameraPresets.ChangeView"
parameter="front_view" />
@@ -79,7 +78,6 @@
</panel_camera_item>
<panel_camera_item
name="group_view"
- top="34"
top_pad="4">
<panel_camera_item.mousedown_callback
function="CameraPresets.ChangeView"
@@ -95,7 +93,6 @@
</panel_camera_item>
<panel_camera_item
name="rear_view"
- top="68"
layout="topleft"
top_pad="4">
<panel_camera_item.mousedown_callback
@@ -124,8 +121,7 @@
width="212"
visible="false">
<panel_camera_item
- name="object_view"
- top="0">
+ name="object_view">
<panel_camera_item.mousedown_callback
function="CameraPresets.ChangeView"
parameter="object_view" />
@@ -140,7 +136,6 @@
</panel_camera_item>
<panel_camera_item
name="mouselook_view"
- top="34"
layout="topleft">
<panel_camera_item.mousedown_callback
function="CameraPresets.ChangeView"