diff options
Diffstat (limited to 'indra/newview/skins/default/xui/en')
8 files changed, 166 insertions, 8 deletions
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 cf843a07a6..535af317d9 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -502,7 +502,7 @@ name="Buy Land..." width="130" /> <button - enabled="true" + enabled="false" follows="left|top" height="23" label="Linden Sale" diff --git a/indra/newview/skins/default/xui/en/floater_auction.xml b/indra/newview/skins/default/xui/en/floater_auction.xml new file mode 100644 index 0000000000..9c6d114c4c --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_auction.xml @@ -0,0 +1,96 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + can_resize="true" + height="412" + layout="topleft" + min_height="412" + min_width="420" + name="floater_auction" + help_topic="floater_auction" + title="START LINDEN LAND SALE" + width="420"> + <floater.string + name="already for sale"> + You cannot auction parcels which are already for sale. + </floater.string> + <icon + bottom="280" + follows="left|right|top|bottom" + layout="topleft" + left="4" + name="snapshot_icon" + right="-4" + top="24" /> + <text + follows="left|right|bottom" + height="16" + layout="topleft" + left_delta="0" + name="parcel_text" + top_pad="12" + width="400" /> + <check_box + control_name="AuctionShowFence" + follows="left|bottom" + height="16" + initial_value="true" + label="Include yellow selection fence" + layout="topleft" + left_delta="0" + name="fence_check" + top_pad="12" + width="199" /> + <button + follows="left|bottom" + height="20" + label="Snapshot" + label_selected="Snapshot" + layout="topleft" + left_delta="0" + name="snapshot_btn" + top_pad="4" + width="150"> + <button.commit_callback + function="ClickSnapshot" /> + </button> + <button + follows="left|bottom" + height="20" + label="Sell to Anyone" + label_selected="Sell to Anyone" + layout="topleft" + left_delta="0" + name="sell_to_anyone_btn" + top_pad="4" + width="150"> + <button.commit_callback + function="ClickSellToAnyone" /> + </button> + <button + follows="left|bottom" + height="20" + label="Clear Settings" + label_selected="Clear Settings" + layout="topleft" + left_delta="0" + name="reset_parcel_btn" + top_pad="4" + width="150"> + <button.commit_callback + function="ClickResetParcel" /> + </button> + <button + follows="left|bottom" + height="20" + label="Start Auction" + label_selected="Start Auction" + layout="topleft" + left_pad="4" + name="start_auction_btn" + top_delta="0" + width="150"> + <button.commit_callback + function="ClickStartAuction" /> + </button> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index ed3cc26851..bdcf3648fa 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -1115,6 +1115,10 @@ label="Zoom" name="Zoom" value="Zoom" /> + <combo_box.item + label="None" + name="None" + value="None" /> </combo_box> <check_box height="23" diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index d28f47c2e1..7c6b1bc357 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -92,11 +92,24 @@ shortcut="alt|shift|S" name="Sit Down Here"> <menu_item_call.on_click - function="Self.SitDown" - parameter="" /> + function="Self.SitDown"/> + <menu_item_call.on_visible + function="Self.ShowSitDown"/> <menu_item_call.on_enable function="Self.EnableSitDown" /> </menu_item_call> + <menu_item_call + label="Stand Up" + layout="topleft" + shortcut="alt|shift|S" + name="Stand up"> + <menu_item_call.on_click + function="Self.StandUp"/> + <menu_item_call.on_visible + function="Self.EnableStandUp"/> + <menu_item_call.on_enable + function="Self.EnableStandUp" /> + </menu_item_call> <menu_item_check label="Fly" name="Fly" diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 7f9dc0c41f..6b164c660a 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -8102,6 +8102,8 @@ Failed to connect to [VOICE_CHANNEL_NAME], please try again later. You will now <unique/> One or more of your subscribed Voice Morphs has expired. [[URL] Click here] to renew your subscription. + +If you are a Premium Member, [[PREMIUM_URL] click here] to receive your voice morphing perk. <tag>fail</tag> <tag>voice</tag> </notification> @@ -8115,6 +8117,8 @@ One or more of your subscribed Voice Morphs has expired. <unique/> The active Voice Morph has expired, your normal voice settings have been applied. [[URL] Click here] to renew your subscription. + +If you are a Premium Member, [[PREMIUM_URL] click here] to receive your voice morphing perk. <tag>fail</tag> <tag>voice</tag> </notification> @@ -8128,6 +8132,8 @@ The active Voice Morph has expired, your normal voice settings have been applied <unique/> One or more of your Voice Morphs will expire in less than [INTERVAL] days. [[URL] Click here] to renew your subscription. + +If you are a Premium Member, [[PREMIUM_URL] click here] to receive your voice morphing perk. <tag>fail</tag> <tag>voice</tag> </notification> @@ -8260,6 +8266,11 @@ Failed to save appearance to XML. Failed to save snapshot to [PATH]: Disk is full. [NEED_MEMORY]KB is required but only [FREE_MEMORY]KB is free. </notification> + <notification icon="notifytip.tga" + name="SnapshotToLocalDirNotExist" type="notifytip"> +Failed to save snapshot to [PATH]: Directory does not exist. + </notification> + <notification icon="notifytip.tga" name="PresetNotSaved" diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index 3a34bcbe21..7759d4fdb2 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -12,6 +12,10 @@ name="forgot_password_url"> http://secondlife.com/account/request.php </panel.string> + <panel.string + name="sign_up_url"> + https://join.secondlife.com/ + </panel.string> <layout_stack follows="left|right|top" height="172" @@ -149,7 +153,18 @@ label="Select grid" layout="topleft" name="server_combo" - width="149" /> + width="149" /> + <text + follows="left|top" + font="SansSerifMedium" + text_color="EmphasisColor" + height="16" + name="sign_up_text" + left="778" + bottom_delta="-10" + width="200"> + Sign up + </text> </layout_panel> <layout_panel height="172" diff --git a/indra/newview/skins/default/xui/en/panel_login_first.xml b/indra/newview/skins/default/xui/en/panel_login_first.xml index 35b80c56ab..213f9a6b0c 100644 --- a/indra/newview/skins/default/xui/en/panel_login_first.xml +++ b/indra/newview/skins/default/xui/en/panel_login_first.xml @@ -12,6 +12,10 @@ name="forgot_password_url"> http://secondlife.com/account/request.php </panel.string> + <panel.string + name="sign_up_url"> + https://join.secondlife.com/ + </panel.string> <layout_stack follows="left|right|top|bottom" width="1024" @@ -168,6 +172,17 @@ width="200"> Forgotten password </text> + <text + follows="left|top" + font="SansSerifLarge" + text_color="EmphasisColor" + height="16" + name="sign_up_text" + left="432" + top="34" + width="200"> + Sign up + </text> </layout_panel> <layout_panel height="100" diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml index b84dce222f..efedb9559e 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml @@ -292,10 +292,14 @@ label="Open" name="Open" value="Open" /> - <combo_box.item - label="Zoom" - name="Zoom" - value="Zoom" /> + <combo_box.item + label="Zoom" + name="Zoom" + value="Zoom" /> + <combo_box.item + label="None" + name="None" + value="None" /> </combo_box> <panel border="false" |