summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/floater_select_key.xml
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-01-14 13:45:23 -0800
committerTofu Linden <tofu.linden@lindenlab.com>2010-01-14 13:45:23 -0800
commitaf2cbcee129911cb4e1d25fbd710d755c13b0282 (patch)
treea09d45e10d3b03c94256424ecd8f881e75551aae /indra/newview/skins/default/xui/en/floater_select_key.xml
parent0a955ae550d3b810da67a17848a6cbc5ef11edb5 (diff)
parent23a266521ead539cb3e8c2c76e7ead46847b70ca (diff)
Merge from viewer2, including fix for the test failure biting qarl.
Minor conflict in llviewerfloaterreg.cpp resolved.
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_select_key.xml')
-rw-r--r--indra/newview/skins/default/xui/en/floater_select_key.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_select_key.xml b/indra/newview/skins/default/xui/en/floater_select_key.xml
index 93aa1f0e31..4e89df5a73 100644
--- a/indra/newview/skins/default/xui/en/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/en/floater_select_key.xml
@@ -15,13 +15,12 @@
follows="left|top"
height="30"
layout="topleft"
- left="10"
+ left="30"
name="Save item as:"
top="25"
word_wrap="true"
- width="220">
- Press a key to set your
-Speak button trigger.
+ width="180">
+ Press a key to set your Speak button trigger.
</text>
<button
height="23"
@@ -30,5 +29,6 @@ Speak button trigger.
layout="topleft"
right="-10"
name="Cancel"
+ top_pad="8"
width="100" />
</floater>