merge changes for storm-1522

2011-08-31 09:03:13 -04:00 · 2011-08-31 09:03:13 -04:00 · a2c5944666
parent 7f06179392 36f9b513b0
commit a2c5944666
2 changed files with 2 additions and 1 deletions
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@ -567,6 +567,7 @@ Jonathan Yap
 	STORM-1276
 	STORM-1462
 	STORM-1459
+	STORM-1522
 Kadah Coba
    STORM-1060
 Jondan Lundquist
--- a/indra/newview/skins/default/xui/en/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_terrain.xml
@ -193,7 +193,7 @@
    </text>
    <text
       follows="left|top"
-       height="20"
+       height="60"
       layout="topleft"
       left_delta="0"
       name="height_text_lbl11"