summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorLis Linden <lis@lindenlab.com>2010-02-01 18:24:20 -0500
committerLis Linden <lis@lindenlab.com>2010-02-01 18:24:20 -0500
commit010b97ee256c8eaa1740a1018c1af7b168929e41 (patch)
treebd9d85b1432bad4cc0462d9aa92259e125ef85cb /indra/newview/skins/default/xui
parentfdc32a367f2f7e19010a26ef338163474850e8bd (diff)
parent142b744062c504d577c1952c6c12ee0f4fd4598f (diff)
Automated merge with ssh://lis@hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_general.xml1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index 22c75a595e..b496f95422 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -323,7 +323,6 @@
follows="left|top"
height="13"
layout="topleft"
- text_color="white"
left="30"
mouse_opaque="false"
name="text_box3"