diff options
| author | angela <angela@lindenlab.com> | 2010-02-23 11:44:56 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2010-02-23 11:44:56 +0800 |
| commit | e98d6a910a39671225f1af627570aee58517ea7f (patch) | |
| tree | 9d0d28c80be1fd23166061e20bfce3d15a924e33 /indra/newview/skins/default/xui/en/panel_group_land_money.xml | |
| parent | 0eea585ef13426bf343fb5bcc3642cdfc769c022 (diff) | |
| parent | 37291bea8d9b5a626b449d984856e280e159ac5c (diff) | |
merg and resolve conflicts
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_group_land_money.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_group_land_money.xml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml index 38b0f234d5..7996a89e72 100644 --- a/indra/newview/skins/default/xui/en/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/en/panel_group_land_money.xml @@ -1,14 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel border="false" - follows="all" height="500" label="Land & L$" layout="topleft" left="0" name="land_money_tab" top="0" - width="313"> + width="304"> <panel.string name="help_text"> A warning appears until the Total Land in Use is less than or = to the Total Contribution. |