diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-30 06:38:39 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-30 06:38:39 -0400 |
| commit | c8c9384949d27a13e754b031cfe0fae115c2b29c (patch) | |
| tree | e7957d66b2da6d4cc4203f4096504422744b047a | |
| parent | ce93fc7fd5175716161aa85cfc75e1be76d0e317 (diff) | |
| parent | ec4a0a8cd827aa71a0edb3cb38f1d1adf2e61721 (diff) | |
merge changes for storm-1327
| -rw-r--r-- | doc/contributions.txt | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_about_land.xml | 31 |
2 files changed, 18 insertions, 15 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index ab1c7ea1ef..fe652bc791 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -103,6 +103,7 @@ Ales Beaumont Alexandrea Fride STORM-255 STORM-960 + STORM-1327 Alissa Sabre VWR-81 VWR-83 @@ -450,6 +451,7 @@ Jonathan Yap STORM-899 STORM-1273 STORM-457 + STORM-1327 STORM-1396 STORM-1292 STORM-1392 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 6e985e0476..ecd2b119c9 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -414,7 +414,7 @@ right="-10" name="Cancel Land Sale" left_pad="5" - top_pad="-15" + top_pad="7" width="180" /> <text type="string" @@ -488,6 +488,7 @@ width="186"> 0 </text> + <button enabled="false" follows="left|top" @@ -495,9 +496,20 @@ label="Buy Land" layout="topleft" left_delta="52" + top_pad="5" name="Buy Land..." - top_pad="7" width="130" /> + <button + enabled="false" + follows="left|top" + height="23" + label="Linden Sale" + layout="topleft" + left="10" + name="Linden Sale..." + tool_tip="Land must be owned, set content, and not already for auction." + top_pad="-23" + width="150" /> <button enabled="true" follows="left|top" @@ -545,18 +557,7 @@ layout="topleft" left_delta="0" name="Reclaim Land..." - top_delta="-50" - width="180" /> - <button - enabled="false" - follows="left|top" - height="23" - label="Linden Sale" - layout="topleft" - left_delta="0" - name="Linden Sale..." - tool_tip="Land must be owned, set content, and not already for auction." - top_pad="2" + top_delta="-25" width="180" /> </panel> <panel @@ -2125,4 +2126,4 @@ Only large parcels can be listed in search. </panel> </panel> </tab_container> -</floater> +</floater>
\ No newline at end of file |