diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-12-06 13:47:19 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-12-06 13:47:19 -0500 |
| commit | ac87f82377e0a676d867a01c16515e74e34b38a9 (patch) | |
| tree | ca09b6743bbf6d248526df2cd00170140397127b | |
| parent | 47958d193ca58ea9df2b64aa4aaf084df9813609 (diff) | |
| parent | fc671fa2b38700b13eb3fdee6d2831404569c1b0 (diff) | |
merge changes for storm-1728
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_region_covenant.xml | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 9f6de781b4..6b2af08fb1 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -589,6 +589,7 @@ Jonathan Yap STORM-1659 STORM-1674 STORM-1685 + STORM-1728 Kadah Coba STORM-1060 Jondan Lundquist diff --git a/indra/newview/skins/default/xui/en/panel_region_covenant.xml b/indra/newview/skins/default/xui/en/panel_region_covenant.xml index df16f6fd37..112f12500d 100644 --- a/indra/newview/skins/default/xui/en/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/en/panel_region_covenant.xml @@ -57,7 +57,7 @@ mouse_opaque="false" name="estate_name_text" top_delta="0" - width="150"> + width="350"> mainland </text> <text @@ -79,7 +79,7 @@ mouse_opaque="false" name="estate_owner_text" top_delta="0" - width="150"> + width="350"> (none) </text> <text |