summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-04-01 00:10:53 -0700
committerRichard Linden <none@none>2011-04-01 00:10:53 -0700
commit84f242ff4fc7743e909f53695a4e7a51c3c60299 (patch)
tree1e460865b69b38b7567a6d54842cdffeebace040 /indra/newview/skins/default/xui
parent3fc293b73b1c504920595a4de71da89f799c4513 (diff)
parent760e672e80de881c0a501dd0b44cfac1342b11c2 (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-social-2
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/panel_hint.xml4
-rw-r--r--indra/newview/skins/default/xui/en/panel_hint_image.xml8
2 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_hint.xml b/indra/newview/skins/default/xui/en/panel_hint.xml
index c883fd8a1d..f7434f0330 100644
--- a/indra/newview/skins/default/xui/en/panel_hint.xml
+++ b/indra/newview/skins/default/xui/en/panel_hint.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
width="205"
- height="100">
+ height="34">
<text name="hint_title"
font="SansSerifMedium"
left="8"
@@ -15,7 +15,7 @@
left="8"
right="197"
top="26"
- bottom="92"
+ bottom="26"
follows="left|right|bottom"
text_color="Black"
wrap="true"/>
diff --git a/indra/newview/skins/default/xui/en/panel_hint_image.xml b/indra/newview/skins/default/xui/en/panel_hint_image.xml
index 30dd1836f1..df05d50dc5 100644
--- a/indra/newview/skins/default/xui/en/panel_hint_image.xml
+++ b/indra/newview/skins/default/xui/en/panel_hint_image.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
width="305"
- height="140"
+ height="40"
layout="topleft">
<text name="hint_title"
font="SansSerifMedium"
@@ -16,7 +16,7 @@
top="25"
width="305"
height="0"
- follows="all"
+ follows="left|top|right"
orientation="horizontal">
<layout_panel auto_resize="true" width="100"/>
<layout_panel auto_resize="true" width="0">
@@ -32,8 +32,8 @@
<text name="hint_text"
left="8"
right="297"
- top_pad="5"
- bottom="120"
+ top="30"
+ bottom="30"
follows="left|right|bottom"
text_color="Black"
wrap="true"/>