summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/floater_telehub.xml
diff options
context:
space:
mode:
authorMonroe Linden <monroe@lindenlab.com>2009-10-05 15:50:24 -0700
committerMonroe Linden <monroe@lindenlab.com>2009-10-05 15:50:24 -0700
commit39ee2367a7e771890017fc3d663780437ea69bb2 (patch)
treeb84c3ade59dba5ae032a3123afb9c3c5f78c9b68 /indra/newview/skins/default/xui/en/floater_telehub.xml
parent374deb8da13c63f80dc1b245488eb254eb86f5d2 (diff)
parent6ef3f20933c5df684298bc1b8f338ce9dfd49070 (diff)
Merging due to changes since my last pull.
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_telehub.xml')
-rw-r--r--indra/newview/skins/default/xui/en/floater_telehub.xml1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_telehub.xml b/indra/newview/skins/default/xui/en/floater_telehub.xml
index b703b49b8b..95de27e0ea 100644
--- a/indra/newview/skins/default/xui/en/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/en/floater_telehub.xml
@@ -88,7 +88,6 @@
</text>
<scroll_list
follows="left|top"
- font="SansSerifSmall"
height="60"
layout="topleft"
left_delta="0"