livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge changes for storm-1327

meow-7.2.2
Oz Linden 2011-06-30 06:38:39 -04:00
parent ce93fc7fd5 ec4a0a8cd8
commit c8c9384949
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/contributions.txt
View File

@ -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

31
indra/newview/skins/default/xui/en/floater_about_land.xml
View File

@ -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>