summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2010-01-04 12:57:31 -0800
committerJames Cook <james@lindenlab.com>2010-01-04 12:57:31 -0800
commit1355d16d2f24f9d623df70059b1f0001cf673209 (patch)
treece50b243817d8acb42306bca85813e2a61e8b278 /indra/newview/skins/default
parentba9a4f80b5bd97ca3b6bd1fa01ddf1c23698a569 (diff)
parent6157187e5bdff889613673f11852d9c25f96bf92 (diff)
Merge, bringing in a few viewer-2-0 bug fixes
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/floater_customize.xml10
1 files changed, 0 insertions, 10 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_customize.xml b/indra/newview/skins/default/xui/en/floater_customize.xml
index 94686f0bb0..0dc7d62b19 100644
--- a/indra/newview/skins/default/xui/en/floater_customize.xml
+++ b/indra/newview/skins/default/xui/en/floater_customize.xml
@@ -12,16 +12,6 @@
title="APPEARANCE"
top_delta="-185"
width="524">
- <check_box
- enabled="true"
- height="23"
- label="Show Attachments in Previews"
- layout="topleft"
- left="110"
- name="show attachments"
- tool_tip="Display attachments on your avatar in the preview panels below."
- top="20"
- width="146" />
<tab_container
height="517"
layout="topleft"