diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-14 13:45:23 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-14 13:45:23 -0800 |
| commit | af2cbcee129911cb4e1d25fbd710d755c13b0282 (patch) | |
| tree | a09d45e10d3b03c94256424ecd8f881e75551aae /indra/newview/skins/default/xui/en/floater_buy_currency.xml | |
| parent | 0a955ae550d3b810da67a17848a6cbc5ef11edb5 (diff) | |
| parent | 23a266521ead539cb3e8c2c76e7ead46847b70ca (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_buy_currency.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_buy_currency.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency.xml b/indra/newview/skins/default/xui/en/floater_buy_currency.xml index 86229c6691..d202bf1b9f 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_currency.xml @@ -107,7 +107,7 @@ height="16" layout="topleft" top_delta="0" - left="242" + left="217" name="currency_label" width="15"> L$ @@ -123,7 +123,7 @@ label="L$" left_pad="3" name="currency_amt" - width="60"> + width="85"> 1234 </line_editor> <text |