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

Merge

master
James Cook 2010-01-05 15:03:29 -08:00
parent 68aa898f6c 6fd776bf99
commit e1283e0b77
8 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,7 +110,7 @@
</text>
<line_editor
follows="left|top"
height="16"
height="23"
layout="topleft"
left_pad="2"
max_length="63"
@ -145,7 +145,7 @@
layout="topleft"
left="10"
name="LandType"
top="84"
top_pad="5"
width="100">
Type:
</text>
@ -192,7 +192,7 @@
layout="topleft"
left="10"
name="Owner:"
top="124"
top_pad="5"
width="100">
Owner:
</text>
@ -202,7 +202,7 @@
follows="left|top"
height="16"
layout="topleft"
left_pad="5"
left_pad="2"
name="OwnerText"
width="240">
Leyla Linden
@ -232,6 +232,7 @@
layout="topleft"
left="10"
name="Group:"
top_pad="7"
width="100">
Group:
</text>
@ -240,10 +241,11 @@
enabled="false"
follows="left|top"
height="16"
left_pad="5"
left_pad="2"
layout="topleft"
name="GroupText"
width="240" />
width="240">
Leyla Linden </text>
<button
follows="right"
height="16"
@ -267,10 +269,10 @@
height="23"
label="Allow Deed to Group"
layout="topleft"
left="96"
left="108"
name="check deed"
tool_tip="A group officer can deed this land to the group, so it will be supported by the group&apos;s land allocation."
top="164"
top_pad="3"
width="146" />
<button
enabled="false"
@ -289,7 +291,7 @@
height="16"
label="Owner Makes Contribution With Deed"
layout="topleft"
left="96"
left="108"
name="check contrib"
tool_tip="When the land is deeded to the group, the former owner contributes enough land allocation to support it."
width="199" />
@ -352,7 +354,7 @@
layout="topleft"
left_delta="-199"
name="For sale to"
top_delta="6"
top_delta="2"
width="186">
For sale to: [BUYER]
</text>
@ -364,7 +366,7 @@
layout="topleft"
left_delta="0"
name="Sell with landowners objects in parcel."
top_pad="8"
top_pad="0"
width="186">
Objects included in sale
</text>
@ -389,6 +391,7 @@
right="-10"
name="Cancel Land Sale"
left_pad="5"
top_pad="-10"
width="145" />
<text
type="string"
@ -422,7 +425,7 @@
layout="topleft"
left="10"
name="PriceLabel"
top="288"
top_pad="5"
width="100">
Area:
</text>
@ -470,7 +473,7 @@
layout="topleft"
left_delta="82"
name="Buy Land..."
top="328"
top_pad="7"
width="100" />
<button
enabled="true"
@ -480,7 +483,7 @@
layout="topleft"
left="10"
name="Scripts..."
top="352"
top_pad="1"
width="100" />
<button
enabled="false"
@ -490,7 +493,7 @@
layout="topleft"
right="-10"
name="Buy For Group..."
top="352"
top_delta="0"
width="180" />
<button
enabled="false"
@ -510,7 +513,7 @@
layout="topleft"
right="-10"
name="Abandon Land..."
top="328"
top_pad="-47"
width="180" />
<button
follows="left|top"
@ -519,7 +522,7 @@
layout="topleft"
left_delta="0"
name="Reclaim Land..."
top_delta="-50"
top_delta="-48"
width="180" />
<button
enabled="false"
@ -530,7 +533,7 @@
left_delta="0"
name="Linden Sale..."
tool_tip="Land must be owned, set content, and not already for auction."
top_pad="4"
top_pad="2"
width="180" />
</panel>
<panel
@ -2022,7 +2025,7 @@ Only large parcels can be listed in search.
multi_select="true"
name="AccessList"
tool_tip="([LISTED] listed, [MAX] max)"
width="240" />
width="230" />
<button
follows="bottom"
height="23"
@ -2047,7 +2050,7 @@ Only large parcels can be listed in search.
follows="top|right"
height="170"
width="240"
left_pad="8">
left_pad="2">
<text
type="string"
length="1"
@ -2071,7 +2074,7 @@ Only large parcels can be listed in search.
multi_select="true"
name="BannedList"
tool_tip="([LISTED] listed, [MAX] max)"
width="240" />
width="230" />
<button
follows="bottom"
height="23"

6
indra/newview/skins/default/xui/en/floater_preview_notecard.xml
View File

@ -11,15 +11,15 @@
min_width="234"
name="preview notecard"
help_topic="preview_notecard"
title="NOTE:"
title="NOTECARD:"
width="400">
<floater.string
name="no_object">
Unable to find object containing this note.
Unable to find object containing this notecard.
</floater.string>
<floater.string
name="not_allowed">
You do not have permission to view this note.
You do not have permission to view this notecard.
</floater.string>
<floater.string
name="Title">

2
indra/newview/skins/default/xui/en/menu_inventory.xml
View File

@ -85,7 +85,7 @@
parameter="lsl" />
</menu_item_call>
<menu_item_call
label="New Note"
label="New Notecard"
layout="topleft"
name="New Note">
<menu_item_call.on_click

2
indra/newview/skins/default/xui/en/menu_inventory_add.xml
View File

@ -71,7 +71,7 @@
parameter="lsl" />
</menu_item_call>
<menu_item_call
label="New Note"
label="New Notecard"
layout="topleft"
name="New Note">
<menu_item_call.on_click

2
indra/newview/skins/default/xui/en/menu_viewer.xml
View File

@ -307,7 +307,7 @@
<menu_item_separator
layout="topleft" />
<menu_item_call
label="Buy Land"
label="Buy This Land"
layout="topleft"
name="Buy Land">
<menu_item_call.on_click

2
indra/newview/skins/default/xui/en/panel_group_roles.xml
View File

@ -258,7 +258,7 @@ things in this group. There&apos;s a broad variety of Abilities.
name="static"
top_pad="5"
width="300">
Assigned Members
Assigned Roles
</text>
<scroll_list
draw_stripes="true"

2
indra/newview/skins/default/xui/en/panel_main_inventory.xml
View File

@ -262,7 +262,7 @@ halign="center"
parameter="lsl" />
</menu_item_call>
<menu_item_call
label="New Note"
label="New Notecard"
layout="topleft"
name="New Note">
<menu_item_call.on_click

6
indra/newview/skins/default/xui/en/panel_people.xml
View File

@ -400,7 +400,7 @@ background_visible="true"
layout="topleft"
name="group_info_btn"
tool_tip="Show group information"
width="110" />
width="102" />
<button
follows="bottom|left"
top="4"
@ -410,7 +410,7 @@ background_visible="true"
layout="topleft"
name="chat_btn"
tool_tip="Open chat session"
width="110" />
width="102" />
<button
follows="bottom|left"
top="4"
@ -420,6 +420,6 @@ background_visible="true"
layout="topleft"
name="group_call_btn"
tool_tip="Call this group"
width="110" />
width="102" />
</panel>
</panel>