summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorangela <angela@lindenlab.com>2010-03-05 13:17:23 +0800
committerangela <angela@lindenlab.com>2010-03-05 13:17:23 +0800
commit2d2d2086f400cd290d90e5db50ff227f6150c17e (patch)
tree17f5eac4697d8acba8a4f012d9ebadf2d98cc975 /indra/newview/skins
parentc18611d72abfc8c08395b13c9d6e8e91fd755ef7 (diff)
parentf9815a6d13074cc3d1adda5aa41171f855097977 (diff)
merge conflicts
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/fr/panel_status_bar.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/fr/panel_status_bar.xml b/indra/newview/skins/default/xui/fr/panel_status_bar.xml
index a11214265e..b9bc1dd9d8 100644
--- a/indra/newview/skins/default/xui/fr/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/fr/panel_status_bar.xml
@@ -21,7 +21,7 @@
<panel.string name="buycurrencylabel">
[AMT] L$
</panel.string>
- <button label="" right="-240" label_selected="" name="buycurrency" tool_tip="Mon solde"/>
+ <button label="" label_selected="" name="buycurrency" right="-250" tool_tip="Mon solde"/>
<button label="Acheter" name="buyL" tool_tip="Cliquez pour acheter plus de L$"/>
<text name="TimeText" tool_tip="Heure actuelle (Pacifique)">
00h00 PST