summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorcallum <none@none>2011-10-11 11:32:05 -0700
committercallum <none@none>2011-10-11 11:32:05 -0700
commitc1a9ca33b27f4e741eeacf781a09156009167ad3 (patch)
treefe7dad57f407e60c6ad0e910a0231d1b420d8899 /indra/newview/skins/default
parent28b97b2478aadc44b41cc99c220e94206def4347 (diff)
parent8154c245dd2f7aaee390e0206f460b9dd5b9f693 (diff)
EXP-1281 Merge with PE code https://hg.lindenlab.com/paulgproductengine/exp-1281/
Changeset: 20897:084550ee5c06
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/floater_camera.xml4
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index da2be18db6..125ca81cde 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
legacy_header_height="18"
- can_dock="true"
can_minimize="true"
- can_close="false"
+ can_close="true"
follows="bottom"
height="164"
layout="topleft"
@@ -11,7 +10,6 @@
help_topic="camera_floater"
save_rect="true"
save_visibility="true"
- save_dock_state="true"
single_instance="true"
width="228">
<floater.string