diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-02-08 22:21:15 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-02-08 22:21:15 -0800 |
| commit | 2a13dc7930000f6d2235840f4a7f3a427a0dba67 (patch) | |
| tree | e4502717a721b3207639d5537211406ecbf2299a | |
| parent | 09b009fc23e75c8403cc9879f7f839d9e2656c02 (diff) | |
| parent | df05f01fcdc77e34d36034ab85300ca0f39b4857 (diff) | |
STORM-960 : pull into viewer-development
| -rw-r--r-- | doc/contributions.txt | 8 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_about_land.xml | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 8765240caa..f1beb5be6d 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -91,11 +91,13 @@ Aleric Inglewood SNOW-744 SNOW-766 STORM-163 + STORM-960 Ales Beaumont VWR-9352 SNOW-240 Alexandrea Fride STORM-255 + STORM-960 Alissa Sabre VWR-81 VWR-83 @@ -390,6 +392,9 @@ Jonathan Yap STORM-869 VWR-17801 VWR-24347 + STORM-844 + STORM-643 + STORM-960 Kage Pixel VWR-11 Ken March @@ -617,6 +622,7 @@ Robin Cornelius SNOW-599 SNOW-747 STORM-422 + STORM-960 VWR-2488 VWR-9557 VWR-10579 @@ -665,6 +671,8 @@ Sergen Davies CT-321 Shawn Kaufmat SNOW-240 +Siana Gearz + STORM-960 SignpostMarv Martin VWR-153 VWR-154 diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml index 3dd6c60095..6cccf5e8f1 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -1932,7 +1932,7 @@ Only large parcels can be listed in search. name="public_access" top_pad="5" label_text.valign="center" - label_text.v_pad="-7" + label_text.v_pad="-2" width="278" /> <text type="string" |