Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • alchemy-archive/alchemy
  • Liru/alchemy
  • TesticularSlingshot/alchemy
3 results
Show changes
Hide whitespace changes
Inline Side-by-side
Showing
with 686 additions and 178 deletions
indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml
View file @ 655d119b
......@@ -42,7 +42,7 @@
parameter="take_off" />
</menu_item_call>
<menu_item_call
label="Upload Photo (L$10)"
label="Upload Photo (L$[UPLOAD_COST])"
layout="topleft"
name="upload_photo">
<on_click
......
indra/newview/skins/default/xui/en/menu_inventory_add.xml
View file @ 655d119b
......@@ -56,7 +56,7 @@
function="File.VisibleUploadModel"/>
</menu_item_call>
<menu_item_call
label="Bulk ([COST] per file)..."
label="Bulk..."
layout="topleft"
name="Bulk Upload">
<menu_item_call.on_click
......
indra/newview/skins/default/xui/en/menu_outfit_gear.xml
View file @ 655d119b
......@@ -40,7 +40,7 @@
parameter="take_off" />
</menu_item_call>
<menu_item_call
label="Upload Photo (L$10)"
label="Upload Photo (L$[UPLOAD_COST])"
layout="topleft"
name="upload_photo">
<on_click
......
indra/newview/skins/default/xui/en/menu_viewer.xml
View file @ 655d119b
......@@ -168,13 +168,16 @@
<menu_item_check.on_click
function="World.AlwaysRun" />
</menu_item_check>
<menu_item_call
<menu_item_check
label="Walk / run / fly..."
name="WalkRunFly">
<menu_item_call.on_click
<menu_item_check.on_check
function="Floater.Visible"
parameter="moveview" />
<menu_item_check.on_click
function="Floater.ToggleOrBringToFront"
parameter="moveview" />
</menu_item_call>
</menu_item_check>
</menu>
<menu
......@@ -596,7 +599,7 @@
<menu_item_check.on_click
function="Floater.Toggle"
parameter="about_land" />
<menu_item_call.on_enable
<menu_item_check.on_enable
function="Floater.CanShow"
parameter="about_land" />
</menu_item_check>
......@@ -610,7 +613,7 @@
<menu_item_check.on_click
function="Floater.Toggle"
parameter="region_info" />
<menu_item_call.on_enable
<menu_item_check.on_enable
function="Floater.CanShow"
parameter="region_info" />
</menu_item_check>
......@@ -1351,7 +1354,8 @@
<menu_item_check
label="Show Selection Outlines"
name="Show Selection Outlines">
name="Show Selection Outlines"
shortcut="control|alt|H">
<menu_item_check.on_check
function="CheckControl"
parameter="RenderHighlightSelections" />
......@@ -1361,7 +1365,8 @@
</menu_item_check>
<menu_item_check
label="Show Hidden Selection"
name="Show Hidden Selection">
name="Show Hidden Selection"
shortcut="control|alt|B">
<menu_item_check.on_check
control="RenderHiddenSelections" />
<menu_item_check.on_click
......@@ -1454,7 +1459,7 @@
function="File.EnableUpload" />
<menu_item_call.on_visible
function="Upload.CalculateCosts"
parameter="Upload Image" />
parameter="Upload Image,texture" />
</menu_item_call>
<menu_item_call
label="Sound ([COST])..."
......@@ -1467,7 +1472,7 @@
function="File.EnableUpload" />
<menu_item_call.on_visible
function="Upload.CalculateCosts"
parameter="Upload Sound" />
parameter="Upload Sound,sound" />
</menu_item_call>
<menu_item_call
label="Animation ([COST])..."
......@@ -1480,7 +1485,7 @@
function="File.EnableUpload" />
<menu_item_call.on_visible
function="Upload.CalculateCosts"
parameter="Upload Animation" />
parameter="Upload Animation,animation" />
</menu_item_call>
<menu_item_call
label="Model..."
......@@ -1495,9 +1500,12 @@
function="File.VisibleUploadModel"/>
</menu_item_call>
<menu_item_call
label="Bulk ([COST] per file)..."
label="Bulk..."
layout="topleft"
name="Bulk Upload">
<menu_item_call.on_visible
function="Upload.CalculateCosts"
parameter="Bulk Upload,texture" />
<menu_item_call.on_click
function="File.UploadBulk"
parameter="" />
......
indra/newview/skins/default/xui/en/notifications.xml
View file @ 655d119b
......@@ -684,6 +684,18 @@ Do you want to revoke modify rights for the selected Residents?
yestext="Yes"/>
</notification>
<notification
icon="alertmodal.tga"
name="GroupNameLengthWarning"
type="alertmodal">
A group name must be between [MIN_LEN] and [MAX_LEN] characters.
<tag>group</tag>
<tag>fail</tag>
<usetemplate
name="okbutton"
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="UnableToCreateGroup"
......@@ -1289,6 +1301,14 @@ Error encoding snapshot.
<tag>fail</tag>
</notification>
<notification
icon="alertmodal.tga"
name="ErrorCannotAffordUpload"
type="alertmodal">
You need L$[COST] to upload this item.
<tag>fail</tag>
</notification>
<notification
icon="alertmodal.tga"
name="ErrorTextureCannotAfford"
......@@ -2286,6 +2306,7 @@ Unable to create output file: [FILE]
icon="alertmodal.tga"
name="DoNotSupportBulkAnimationUpload"
type="alertmodal">
<unique/>
[APP_NAME] does not currently support bulk upload of BVH format animation files.
<tag>fail</tag>
</notification>
......@@ -3477,6 +3498,9 @@ Display settings have been set to recommended levels because of a change to the
icon="alertmodal.tga"
name="ErrorMessage"
type="alertmodal">
<unique>
<context>ERROR_MESSAGE</context>
</unique>
[ERROR_MESSAGE]
<tag>fail</tag>
<usetemplate
......@@ -3583,6 +3607,26 @@ If this is your first time using [CURRENT_GRID], you will need to create an acco
yestext="Create Account..."/>
</notification>
<notification
icon="alertmodal.tga"
name="LoginCantRemoveUsername"
type="alertmodal">
<tag>fail</tag>
Already remembered user can be forgotten from Me &gt; Preferences &gt; Advanced &gt; Remembered Usernames.
</notification>
<notification
icon="alertmodal.tga"
name="LoginCantRemoveCurUsername"
type="alertmodal">
<tag>confirm</tag>
Forgetting the logged-in user requires you to log out.
<usetemplate
name="okcancelbuttons"
notext="Cancel"
yestext="Confirm and log out"/>
</notification>
<notification
icon="alertmodal.tga"
name="LoginPacketNeverReceived"
......@@ -3636,6 +3680,18 @@ You can either check your Internet connection and try again in a few minutes or
</form>
</notification>
<notification
icon="alertmodal.tga"
name="LoginRemoveMultiGridUserData"
type="alertmodal">
<tag>confirm</tag>
Local Data you are deleting is shared between multiple grids, are you sure you want to delete it?
<usetemplate
name="okcancelbuttons"
notext="Cancel"
yestext="Confirm"/>
</notification>
<notification
icon="alertmodal.tga"
name="WelcomeChooseSex"
......@@ -4360,11 +4416,21 @@ You have reached your maximum number of groups. Please leave some group before j
icon="alert.tga"
name="GroupLimitInfo"
type="alert">
The group limit for base accounts is [MAX_BASIC], and for [https://secondlife.com/premium/ premium]
accounts is [MAX_PREMIUM].
If you downgraded your account, you will need to get below [MAX_BASIC] group limit before you can join more.
Residents with Basic memberships may join up to [MAX_BASIC] groups.
Premium memberships allow up to [MAX_PREMIUM]. [https://secondlife.com/my/account/membership.php? Learn more or upgrade]
<tag>group</tag>
<usetemplate
name="okbutton"
yestext="Close"/>
</notification>
[https://secondlife.com/my/account/membership.php Upgrade today!]
<notification
icon="alert.tga"
name="GroupLimitInfoPlus"
type="alert">
Residents with Basic memberships may join up to [MAX_BASIC] groups.
Premium memberships allow up to [MAX_PREMIUM]. Premium Plus
memberships allow up to [MAX_PREMIUM_PLUS]. [https://secondlife.com/my/account/membership.php? Learn more or upgrade]
<tag>group</tag>
<usetemplate
name="okbutton"
......@@ -6087,6 +6153,34 @@ Would you like to turn off Do Not Disturb before completing this transaction?
</form>
</notification>
<notification
icon="notify.tga"
label="Parcel is Playing Media"
name="ParcelPlayingMedia"
persist="false"
type="notify">
This location plays media:
[URL]
Would you like to play it?
<tag>confirm</tag>
<form name="form">
<ignore name="ignore"
checkbox_only="true"
text="Always choose this option for this land."/>
<button
ignore="Play Media"
index="1"
name="Yes"
text="Play"/>
<button
default="true"
ignore="Ignore Media"
index="0"
name="No"
text="Don't play"/>
</form>
</notification>
<notification
icon="alertmodal.tga"
name="ConfirmDeleteProtectedCategory"
......@@ -6197,6 +6291,20 @@ Are you sure you want to permanently delete the contents of your Lost And Found?
yestext="Yes"/>
</notification>
<notification
icon="alertmodal.tga"
name="ConfirmReplaceLink"
type="alertmodal">
You're about to replace '[TYPE]' body part link with the item which doesn't match the type.
Are you sure you want to proceed?
<tag>confirm</tag>
<usetemplate
ignoretext="Confirm before I replace link"
name="okcancelignore"
notext="No"
yestext="Yes"/>
</notification>
<notification
icon="alertmodal.tga"
name="CopySLURL"
......@@ -7563,6 +7671,10 @@ Offer a teleport?
index="1"
name="Decline"
text="Decline"/>
<button
index="2"
name="IM"
text="IM"/>
</form>
</notification>
......@@ -7594,6 +7706,10 @@ Offer a teleport?
index="1"
name="Decline"
text="Decline"/>
<button
index="2"
name="IM"
text="IM"/>
</form>
</notification>
......@@ -8479,7 +8595,48 @@ Your voice has been muted by moderator.
name="okbutton"
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="FailedToGetBenefits"
type="alertmodal">
Unfortunately, we were unable to get benefits information for this session. This should not happen in a normal production environment. Please contact support. This session will not work normally and we recommend that you restart.
<usetemplate
name="okbutton"
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="BulkUploadCostConfirmation"
type="alertmodal">
This will upload [COUNT] items at a total cost of L$[COST]. Do you wish to continue with the upload?
<usetemplate
name="okcancelbuttons"
notext="Cancel"
yestext="Upload"/>
</notification>
<notification
icon="alertmodal.tga"
name="BulkUploadNoCompatibleFiles"
type="alertmodal">
Selected files can not be bulk-uploaded.
<usetemplate
name="okbutton"
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="BulkUploadIncompatibleFiles"
type="alertmodal">
Some of the selected files can not be bulk-uploaded.
<usetemplate
name="okbutton"
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="UploadCostConfirmation"
......@@ -11877,19 +12034,6 @@ Are you sure you wish to continue?
notext="Cancel"
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="RemoveLoginCredential"
type="alertmodal">
Do you want to remove '[NAME]' from the list?
<tag>confirm</tag>
<usetemplate
name="okcancelbuttons"
notext="Cancel"
yestext="OK"/>
</notification>
<notification
icon="alert.tga"
......
indra/newview/skins/default/xui/en/panel_edit_classified.xml
View file @ 655d119b
......@@ -143,7 +143,6 @@
follows="left|top|right"
height="100"
width="273"
hide_scrollbar="false"
layout="topleft"
left="10"
top_pad="2"
......
indra/newview/skins/default/xui/en/panel_group_creation_sidetray.xml 0 → 100644
View file @ 655d119b
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
background_visible="true"
follows="all"
height="570"
label="Group Creation"
layout="topleft"
min_height="350"
left="0"
top="20"
name="GroupCreation"
width="313">
<panel.string
name="current_membership">
(your membership)
</panel.string>
<panel
name="group_info_top"
follows="top|left"
top="0"
left="0"
height="29"
width="313"
layout="topleft">
<line_editor
follows="left|top"
font="SansSerif"
label="Type your new group name here"
layout="topleft"
max_length_bytes="35"
name="group_name_editor"
left="12"
top="5"
width="270"
height="20"
visible="true" />
</panel>
<layout_stack
name="layout"
orientation="vertical"
follows="all"
left="8"
top_pad="0"
height="538"
width="300"
border_size="0">
<layout_panel
bg_alpha_color="DkGray2"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true"
name="group_info"
follows="all"
layout="topleft"
auto_resize="false"
user_resize="false"
height="206"
width="313">
<panel
name="group_info_top"
follows="top|left|right"
top="0"
left="0"
height="99"
width="312"
layout="topleft">
<texture_picker
default_image_name="Generic_Group_Large"
follows="left|top"
name="insignia"
label=""
no_commit_on_selection="true"
tool_tip="Click to choose a picture"
layout="topleft"
height="110"
left="5"
top="5"
width="100" />
<text_editor
follows="left|top|right"
layout="topleft"
type="string"
name="charter"
left_pad="3"
height="86"
max_length="511"
top="6"
right="-4"
bg_readonly_color="DkGray2"
text_readonly_color="White"
word_wrap="true">
Group Charter
</text_editor>
</panel>
<panel
layout="topleft"
follows="left|top|right"
background_visible="false"
bevel_style="none"
border="false"
bg_alpha_color="FloaterUnfocusBorderColor"
height="100"
width="313"
left="0"
name="preferences_container"
top_pad="5">
<check_box
follows="right|top|left"
layout="topleft"
label="Anyone can join"
height="16"
left="10"
name="open_enrollement"
tool_tip="Sets whether this group allows new members to join without being invited."
width="90" />
<check_box
label="Cost to join"
layout="topleft"
name="check_enrollment_fee"
tool_tip="Sets whether to require an enrollment fee to join the group"
top_pad="5"
left_delta="0"
height="16"
width="300" />
<spinner
decimal_digits="0"
follows="left|top"
halign="left"
increment="1"
label_width="15"
label="L$"
layout="topleft"
max_val="99999"
height="23"
left="30"
name="spin_enrollment_fee"
tool_tip="New members must pay this fee to join the group when Enrollment Fee is checked."
width="170" />
<combo_box
follows="left|top"
layout="topleft"
name="group_mature_check"
tool_tip="Maturity ratings designate the type of content and behavior allowed in a group"
height="23"
left="10"
top_pad="4"
width="190">
<combo_item name="select_mature" value="Select">
- Select maturity rating -
</combo_item>
<combo_box.item
label="Moderate Content"
name="mature"
value="Mature" />
<combo_box.item
label="General Content"
name="pg"
value="Not Mature" />
</combo_box>
</panel>
</layout_panel>
<layout_panel
background_visible="false"
background_opaque="true"
name="create_info"
follows="all"
layout="topleft"
auto_resize="false"
user_resize="false"
height="200"
width="313">
<text
font="SansSerifSmall"
follows="top|left|right"
layout="topleft"
mouse_opaque="false"
type="string"
name="fee_information"
skip_link_underline="true"
height="26"
left="8"
right="-8"
top="5"
word_wrap="true">
The fee to create a group is based on your membership level. [https://secondlife.com/my/account/membership.php More info]
</text>
<scroll_list
draw_border="false"
background_visible="false"
follows="left|top|bottom|right"
layout="topleft"
multi_select="true"
name="membership_list"
row_padding="4"
enabled="false"
height="150"
left="2"
top_pad="8"
width="290">
<scroll_list.columns
dynamic_width="false"
name="clmn_name"
width="220"/>
<scroll_list.columns
dynamic_width="true"
name="clmn_price"/>
<scroll_list.rows
name="basic"
value="Basic (placeholder)"/>
<scroll_list.rows
name="plc2"
value="" />
<scroll_list.rows
name="premium"
value="Premium (placeholder)" />
</scroll_list>
</layout_panel>
<layout_panel
background_visible="false"
background_opaque="true"
name="create_actions"
follows="all"
layout="topleft"
auto_resize="true"
user_resize="true"
height="200"
width="313">
</layout_panel>
<layout_panel
background_visible="false"
background_opaque="true"
name="create_actions"
follows="all"
layout="topleft"
auto_resize="false"
user_resize="false"
height="75"
width="313">
<layout_stack
follows="bottom|left|right"
layout="topleft"
name="button_row_ls"
left="1"
right="-1"
orientation="horizontal"
height="25"
top="1">
<layout_panel
follows="bottom|left|right"
layout="bottomleft"
name="layout_crt"
auto_resize="true"
height="23"
width="91">
<!-- placeholder to autoadjust buttons (since they are of different sizes)-->
</layout_panel>
<layout_panel
follows="bottom|left|right"
layout="bottomleft"
name="layout_crt"
auto_resize="false"
height="23"
width="245">
<button
follows="bottom|left|right"
layout="topleft"
label="Create group for L$ [COST]"
name="btn_create"
visible="true"
tool_tip="Create a new Group"
height="23"
left="1"
top="0"
width="160" />
<button
follows="bottom|left|right"
name="back"
label="Cancel"
layout="topleft"
tool_tip="Return to list of groups"
left_pad="13"
height="23"
top="0"
width="70" />
</layout_panel>
<layout_panel
follows="bottom|left|right"
layout="bottomleft"
name="layout_crt"
auto_resize="true"
height="23"
width="91">
<!-- placeholder to autoadjust buttons-->
</layout_panel>
</layout_stack>
<text
font="SansSerifSmall"
follows="top|left|right"
layout="topleft"
mouse_opaque="false"
type="string"
height="26"
left="6"
right="-6"
name="info_deletion"
top_pad="8"
word_wrap="true"
halign="center">
Note: After 7 days, a group with no members (other than the creator) is deleted
</text>
</layout_panel>
</layout_stack>
</panel>
indra/newview/skins/default/xui/en/panel_login.xml
View file @ 655d119b
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
follows="all"
height="600"
height="768"
layout="topleft"
left="0"
name="panel_login"
focus_root="true"
top="600"
width="1130">
background_visible="true"
background_opaque="true"
width="1024">
<!-- *NOTE: Custom resize logic for login_html in llpanellogin.cpp -->
<web_browser
tab_stop="false"
trusted_content="true"
bg_opaque_color="Black"
border_visible="false"
bottom="600"
follows="all"
left="0"
name="login_html"
start_url=""
top="0"
height="600"
width="996"/>
top="18"
height="670"
width="1024" />
<layout_stack
animate="false"
clip="false"
......@@ -29,16 +29,16 @@
name="login_widgets"
layout="topleft"
orientation="horizontal"
top="519"
width="1130"
top="688"
width="1024"
height="80">
<layout_panel
auto_resize="false"
follows="left|bottom"
name="login"
layout="topleft"
width="310"
min_width="310"
width="335"
min_width="335"
height="80">
<text
follows="left|bottom"
......@@ -62,34 +62,48 @@
width="150">
Username:
</text>
<button
follows="left|bottom"
height="18"
image_unselected="TrashItem_Off"
image_selected="TrashItem_Press"
image_pressed="TrashItem_Press"
tool_tip="Remove this username"
label=""
layout="topleft"
name="remove_user_btn"
left="195"
top_pad="0"
width="18" />
<combo_box
allow_text_entry="true"
follows="left|bottom"
height="22"
left_delta="0"
left="15"
max_chars="128"
combo_editor.commit_on_focus_lost="false"
combo_editor.prevalidate_callback="ascii"
tool_tip="The username you chose when you registered, like bobsmith12 or Steller Sunshine"
top_pad="0"
tool_tip="The account name you chose when you registered, like bobsmith420 or Steller Sunshine"
top_delta="0"
name="username_combo"
width="178">
<!-- empirically, displayed width is 150 anyway?!? fight me! -->
<combo_box.combo_button
visible="false"/>
<combo_box.drop_down_button
visible="false"/>
<combo_box.combo_editor
text_pad_left="8"
bg_image_always_focused="true"/>
</combo_box>
<!-- left="175" based on actual "username_combo" width of 150 vs. 178 -->
<text
follows="left|bottom"
font="SansSerifSmall"
height="16"
name="password_text"
top="35"
left="175"
width="150">
left="217"
width="128">
Password:
</text>
<!-- STEAM-14: Turn off commit_on_focus_lost so if user presses Enter
with focus in this line_editor, we can use commit action to
initiate login -->
<line_editor
follows="left|bottom"
height="22"
......@@ -99,7 +113,7 @@
select_on_focus="true"
commit_on_focus_lost="false"
top_pad="0"
width="135" />
width="128" />
</layout_panel>
<layout_panel
auto_resize="false"
......@@ -128,17 +142,17 @@
top_pad="0"
name="start_location_combo"
width="165">
<combo_box.item
label="My last location"
name="MyLastLocation"
value="last" />
<combo_box.item
label="My home"
name="MyHome"
value="home" />
<combo_box.item
label="&lt;Type region name&gt;"
name="Typeregionname" value="" />
<combo_box.combo_editor
bg_image_always_focused="true"
text_pad_left="8"/>
<combo_box.item
label="Last location"
name="MyLastLocation"
value="last" />
<combo_box.item
label="Home"
name="MyHome"
value="home" />
</combo_box>
</layout_panel>
<layout_panel
......@@ -149,18 +163,30 @@
width="145"
height="80"
visible="false">
<text
follows="left|bottom"
font="SansSerifSmall"
height="16"
name="grid_login_text"
top="35"
left="10"
width="128">
Log into Grid:
</text>
<combo_box
allow_text_entry="false"
font="SansSerifSmall"
follows="left|right|bottom"
height="23"
max_chars="256"
left="10"
top="51"
layout="topleft"
top_pad="2"
name="server_combo"
width="135" />
allow_text_entry="true"
follows="left|bottom"
height="22"
max_chars="256"
top_pad="0"
combo_editor.commit_on_focus_lost="false"
combo_editor.prevalidate_callback="ascii"
name="server_combo"
width="135"
combo_button.scale_image="true" >
<combo_box.drop_down_button
font="SansSerifLarge"/>
</combo_box>
</layout_panel>
<layout_panel
auto_resize="false"
......@@ -174,78 +200,49 @@
font="SansSerifSmall"
text_color="EmphasisColor"
left="10"
height="18"
name="login_help"
top="17"
height="16"
name="sign_up_text"
top="10"
width="280">
Need help logging in?
Create an account
</text>
<text
follows="left|bottom"
font="SansSerifSmall"
text_color="EmphasisColor"
height="18"
height="16"
name="forgot_password_text"
top="32"
top="26"
width="280">
Forgot your username or password?
</text>
<button
follows="left|bottom"
top_pad="0"
top_pad="9"
height="23"
image_unselected="PushButton_On"
image_selected="PushButton_On_Selected"
label="Log In"
label_color="White"
layout="topleft"
name="connect_btn"
width="90" />
<check_box
follows="left|bottom"
font="SansSerifSmall"
left="110"
top="45"
height="16"
label="Remember username"
name="remember_name"
width="145" />
<check_box
control_name="RememberPassword"
follows="left|bottom"
font="SansSerifSmall"
left="110"
top="56"
height="16"
label="Remember password"
top_pad="3"
name="remember_check"
top_pad="1"
name="remember_password"
width="145" />
</layout_panel>
<layout_panel
tab_stop="false"
follows="right|bottom"
name="links"
width="210"
min_width="100"
height="80">
<text
follows="right|bottom"
font="SansSerif"
font.style="BOLD"
font.size="Large"
halign="right"
height="16"
name="create_account_text"
top="8"
right="-15"
width="200">
CREATE YOUR ACCOUNT
</text>
<button
follows="right|bottom"
top="35"
right="-15"
height="23"
image_unselected="PushButton_On"
image_selected="PushButton_On_Selected"
label="Start now"
label_color="White"
layout="topleft"
left_pad="10"
name="create_new_account_btn"
width="90" />
</layout_panel>
</layout_stack>
</panel>
indra/newview/skins/default/xui/en/panel_outbox_inventory.xml deleted 100644 → 0
View file @ d37e2d1b
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<inventory_panel
name="inventory_outbox"
start_folder.name="Outbox"
show_empty_message="false"
start_folder.type="outbox"
follows="all" layout="topleft"
top="0" left="0" height="165" width="308"
top_pad="0"
bg_opaque_color="DkGray2"
bg_alpha_color="DkGray2"
background_visible="true"
border="false"
bevel_style="none"
show_item_link_overlays="true"
tool_tip="Drag and drop items here to prepare them for sale on your storefront"
scroll.reserve_scroll_corner="false">
<folder folder_arrow_image="Folder_Arrow"
folder_indentation="8"
item_height="20"
item_top_pad="4"
selection_image="Rounded_Square"
left_pad="5"
icon_pad="2"
icon_width="16"
text_pad="1"
text_pad_right="4"
arrow_size="12"
max_folder_item_overlap="2"/>
<item allow_wear="false"/>
</inventory_panel>
indra/newview/skins/default/xui/en/panel_outfit_snapshot_inventory.xml
View file @ 655d119b
......@@ -41,7 +41,7 @@
<text
follows="top|left"
font="SansSerif"
height="56"
height="126"
layout="topleft"
left="10"
length="1"
......@@ -50,7 +50,9 @@
width="200"
type="string"
word_wrap="true">
Uploading an image to your inventory costs L$[UPLOAD_COST].
Uploading an image to your inventory costs L$[UPLOAD_COST].
Fee is based on your subscription level. Higher levels are charged lower fees.
</text>
<button
follows="right|bottom"
......@@ -67,7 +69,7 @@
<button
follows="left|bottom"
height="23"
label="UPLOAD L$10"
label="UPLOAD L$[UPLOAD_COST]"
layout="topleft"
left="10"
name="save_btn"
......@@ -76,4 +78,4 @@
<button.commit_callback
function="Inventory.SaveOutfitPhoto" />
</button>
</panel>
\ No newline at end of file
</panel>
indra/newview/skins/default/xui/en/panel_people.xml
View file @ 655d119b
......@@ -56,7 +56,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
value="[REGION](Double-click to teleport, shift-drag to pan)"/>
<string
name="GroupCountWithInfo"
value="You belong to [COUNT] groups, and can join [REMAINING] more. [secondlife:/// Want more?]"/>
value="You belong to [COUNT] groups, and can join [REMAINING] more. [secondlife:/// Raise your limit]"/>
<tab_container
bottom="-5"
follows="all"
......
indra/newview/skins/default/xui/en/panel_pick_info.xml
View file @ 655d119b
......@@ -103,7 +103,6 @@
height="100"
width="280"
parse_urls="true"
hide_scrollbar="false"
layout="topleft"
left="10"
top_pad="2"
......
indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
View file @ 655d119b
......@@ -139,7 +139,7 @@
layout="topleft"
left_pad="0"
max_val="4.0"
min_val="0.75"
min_val="0.5"
name="ui_scale_slider"
top_pad="-14"
width="250" />
......@@ -238,14 +238,27 @@
top_pad="5"
width="237"/>
<button
follows="top|left"
layout="topleft"
label="Remembered Usernames"
name="remembered_usernames"
height="20"
label="Default Creation Permissions"
left="30"
top_pad="16"
width="200">
<button.commit_callback
function="Pref.RememberedUsernames" />
</button>
<button
follows="top|left"
layout="topleft"
label="Default Creation Permissions"
name="default_creation_permissions"
height="20"
left="30"
top_pad = "20"
width="250">
<button.commit_callback
function="Pref.PermsDefault" />
top_pad="16"
width="200">
<button.commit_callback
function="Pref.PermsDefault" />
</button>
</panel>
indra/newview/skins/default/xui/en/panel_preferences_interface.xml
View file @ 655d119b
......@@ -277,6 +277,15 @@
value="3"
width="90" />
</radio_group>
<check_box
follows="left|top"
height="16"
label="Mark unnamed objects in chat and IMs"
left="7"
top_pad="15"
name="AlchemyChatMarkUnnamedObjects"
control_name="AlchemyChatMarkUnnamedObjects"
width="150" />
</panel>
</tab_container>
</panel>
indra/newview/skins/default/xui/en/panel_preferences_sound.xml
View file @ 655d119b
......@@ -341,6 +341,40 @@
name="enable_voice_check"
width="110"/>
<!-- -->
<text
follows="left|top"
layout="topleft"
height="15"
left="0"
top_pad="3"
width="120"
halign="right"
name="media_autoplay_label">
Media auto-play
</text>
<combo_box
control_name="ParcelMediaAutoPlayEnable"
enabled_control="AudioStreamingMedia"
follows="left|top"
layout="topleft"
height="23"
left_pad="7"
top_delta="-4"
name="media_auto_play_combo"
width="100">
<item
label="No"
name="autoplay_disabled"
value="0"/>
<item
label="Yes"
name="autoplay_enabled"
value="1"/>
<item
label="Ask"
name="autoplay_ask"
value="2"/>
</combo_box>
<text
type="string"
length="1"
......@@ -462,6 +496,14 @@
name="middle_mouse">
Middle Mouse
</panel.string>
<panel.string
name="button4_mouse">
Mouse Button 4
</panel.string>
<panel.string
name="button5_mouse">
Mouse Button 5
</panel.string>
<text
type="string"
length="1"
......
indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
View file @ 655d119b
......@@ -38,6 +38,6 @@
right="-4"
bg_readonly_color="DkGray2"
text_readonly_color="White"
word_wrap="true"
parse_urls="true" />
commit_on_focus_lost="true"
word_wrap="true" />
</panel>
indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
View file @ 655d119b
......@@ -158,8 +158,7 @@
bg_readonly_color="DkGray2"
text_readonly_color="White"
commit_on_focus_lost="true"
word_wrap="true"
parse_urls="true" />
word_wrap="true" />
<text
font="SansSerifSmall"
text_color="White_50"
......
indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
View file @ 655d119b
......@@ -122,7 +122,7 @@
width="200"
type="string"
word_wrap="true">
Saving an image to your inventory costs L$[UPLOAD_COST]. To save your image as a texture select one of the square formats.
To save your image as a texture select one of the square formats.
</text>
<button
follows="right|bottom"
......
indra/newview/skins/default/xui/en/panel_snapshot_options.xml
View file @ 655d119b
......@@ -73,4 +73,18 @@
<button.commit_callback
function="Snapshot.SaveToEmail" />
</button>
<text
follows="top|left"
font="SansSerif"
height="56"
layout="topleft"
left="10"
length="1"
name="fee_hint_lbl"
top_pad="7"
width="200"
type="string"
word_wrap="true">
Fee is based on your subscription level. Higher levels are charged lower fees.
</text>
</panel>
\ No newline at end of file
indra/newview/skins/default/xui/en/panel_status_bar.xml
View file @ 655d119b
......@@ -105,21 +105,20 @@
visible="true"
layout="topleft"
name="currency_balance_panel"
width="60">
width="65">
<text
halign="right"
font="SansSerifSmall"
follows="all"
height="18"
left="0"
right="58"
name="balance"
tool_tip="Click to refresh your L$ balance"
v_pad="2"
top="0"
wrap="false"
value="L$ --"
width="60" />
value="L$ ------"
width="65" />
</layout_panel>
<layout_panel
visibility_control="ShowStatusBarBuyCurrency"
......@@ -155,7 +154,7 @@
visible="true"
layout="topleft"
name="time_lp"
width="213">
width="168">
<text
type="string"
font="SansSerifSmall"
......@@ -168,7 +167,7 @@
left="0"
name="TimeText"
tool_tip="Current time (Pacific)"
width="135">
width="90">
24:00:00 AM PST
</text>
<button
......