diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-08-14 14:44:36 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-08-14 14:44:36 -0400 |
| commit | 21bfcbde7ec6e6b3e8a92237b7c33879216c4e82 (patch) | |
| tree | 5346bb05d7f74d2f2021883ff0ee4f32bbb56f4a /indra/newview/skins/default/xui/en | |
| parent | 2da8eb43d57ae6876f9955386f604f2c56849211 (diff) | |
| parent | aff85ed92c5aad3a9445cf4ec5447cc56c44dfc0 (diff) | |
Merge changes
Diffstat (limited to 'indra/newview/skins/default/xui/en')
36 files changed, 1238 insertions, 797 deletions
diff --git a/indra/newview/skins/default/xui/en/favorites_bar_button.xml b/indra/newview/skins/default/xui/en/favorites_bar_button.xml new file mode 100644 index 0000000000..4525df31b6 --- /dev/null +++ b/indra/newview/skins/default/xui/en/favorites_bar_button.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<!-- *NOTE: mantipov: to use the "use_ellipses" attribute label should be LEFT aligned +untill LLFontGL::render() is fixed to avoid this requirement--> +<!-- *NOTE: mantipov: top & height should be synchronized with <favorites_bar> in the panel_navigation_bar.xml--> +<!-- All buttons in the Favorites bar will be created from this one --> +<button + follows="left|bottom" + halign="left" + height="23" + image_disabled="transparent.j2c" + image_disabled_selected="PushButton_Selected" + image_hover_selected="PushButton_Selected" + image_hover_unselected="PushButton_Off" + image_selected="PushButton_Selected" + image_unselected="transparent.j2c" + layout="topleft" + left="2" + name="favorites_bar_btn" + tab_stop="false" + top="2" + use_ellipses="true" + width="120" /> diff --git a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml index 0012294160..b0472eb7e2 100644 --- a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml +++ b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml @@ -157,7 +157,7 @@ label="Range" layout="topleft" left="10" - max_val="40" + max_val="130" min_val="5" name="near_me_range" top="32" diff --git a/indra/newview/skins/default/xui/en/floater_buy_land.xml b/indra/newview/skins/default/xui/en/floater_buy_land.xml index ec52c565ae..777236504d 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_land.xml @@ -374,9 +374,11 @@ supports [AMOUNT2] objects length="1" bottom_delta="-119" follows="top|left" + height="16" layout="topleft" left="204" name="info_parcel_label" + top="30" width="48"> Parcel: </text> @@ -389,7 +391,7 @@ supports [AMOUNT2] objects layout="topleft" left_delta="16" name="info_parcel" - top_delta="-1" + top_pad="1" width="180"> Scotopteryx 138,204 </text> @@ -397,9 +399,11 @@ supports [AMOUNT2] objects type="string" length="1" follows="top|left" + height="16" layout="topleft" left="204" name="info_size_label" + top_pad="1" width="48"> Size: </text> @@ -412,7 +416,7 @@ supports [AMOUNT2] objects layout="topleft" left_delta="16" name="info_size" - top_delta="-1" + top_pad="1" width="180"> 1024 m² </text> @@ -420,9 +424,11 @@ supports [AMOUNT2] objects type="string" length="1" follows="top|left" + height="16" layout="topleft" left="204" name="info_price_label" + top_pad="1" width="48"> Price: </text> @@ -435,7 +441,7 @@ supports [AMOUNT2] objects layout="topleft" left_delta="16" name="info_price" - top_delta="-1" + top_pad="1" width="180"> L$ 1500 (L$ 1.1/m²) @@ -450,7 +456,7 @@ sold with objects layout="topleft" left="16" name="info_action" - top="156" + top="166" width="350"> Buying this land will: </text> @@ -485,7 +491,7 @@ sold with objects layout="topleft" left_delta="0" name="error_web" - top_delta="144" + top_delta="154" width="120" /> <locate height="-200" @@ -508,7 +514,7 @@ sold with objects left="72" name="account_action" right="438" - top="190" + top="200" width="218"> Upgrade you to premium membership. </text> @@ -562,7 +568,7 @@ sold with objects left="72" name="land_use_action" right="438" - top="274" + top="284" width="218"> Increase your monthly land use fees to US$ 40/month. </text> @@ -638,7 +644,7 @@ sold with objects layout="topleft" left="170" name="currency_amt" - top="398" + top="408" width="80"> 1000 </line_editor> @@ -654,7 +660,7 @@ sold with objects layout="topleft" left="260" name="currency_est" - top="399" + top="409" width="178"> for approx. US$ [AMOUNT2] </text> diff --git a/indra/newview/skins/default/xui/en/floater_inventory.xml b/indra/newview/skins/default/xui/en/floater_inventory.xml index 37c6cbf391..610c62a21a 100644 --- a/indra/newview/skins/default/xui/en/floater_inventory.xml +++ b/indra/newview/skins/default/xui/en/floater_inventory.xml @@ -207,6 +207,22 @@ parameter="category" /> </menu_item_call> <menu_item_call + label="New Outfit" + layout="topleft" + name="New Outfit"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="outfit" /> + </menu_item_call> + <menu_item_call + label="New My Outfits" + layout="topleft" + name="New My Outfits"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="my_otfts" /> + </menu_item_call> + <menu_item_call label="New Script" layout="topleft" name="New Script"> diff --git a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml index 6cb044cda1..467168ebd8 100644 --- a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml +++ b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater auto_tile="true" - height="320" + height="340" layout="topleft" name="item properties" save_rect="true" @@ -185,31 +185,71 @@ name="OwnerLabel" top="125" width="78"> - You can: + You: </text> <check_box height="16" - label="Modify" + label="Edit" layout="topleft" - left_delta="0" + left_pad="5" name="CheckOwnerModify" - top_pad="4" + top_delta="0" width="78" /> <check_box height="16" label="Copy" layout="topleft" - left_delta="78" + left_delta="0" name="CheckOwnerCopy" - top_delta="0" + top_pad="5" width="88" /> <check_box height="16" - label="Resell/Give away" + label="Resell" layout="topleft" - left_delta="88" + left_delta="0" name="CheckOwnerTransfer" + top_pad="5" + width="106" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="10" + name="AnyoneLabel" + top_pad="5" + width="78"> + Anyone: + </text> + <check_box + height="16" + label="Copy" + layout="topleft" + left_pad="5" + name="CheckEveryoneCopy" top_delta="0" + width="130" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="10" + name="GroupLabel" + top_pad="5" + width="78"> + Group: + </text> + <check_box + height="16" + label="Share" + layout="topleft" + left_pad="5" + name="CheckShareWithGroup" + top_delta="5" width="106" /> <text type="string" @@ -218,6 +258,93 @@ height="10" layout="topleft" left="10" + name="NextOwnerLabel" + top_pad="5" + width="78"> + Next owner: + </text> + <check_box + height="16" + label="Edit" + layout="topleft" + left_pad="5" + name="CheckNextOwnerModify" + top_delta="0" + width="78" /> + <check_box + height="16" + label="Copy" + layout="topleft" + left_delta="0" + name="CheckNextOwnerCopy" + top_pad="5" + width="88" /> + <check_box + height="16" + label="Resell" + layout="topleft" + left_delta="0" + name="CheckNextOwnerTransfer" + top_pad="5" + width="106" /> + <check_box + height="16" + label="For Sale" + layout="topleft" + left="10" + name="CheckPurchase" + top_pad="5" + width="78" /> + <combo_box + height="19" + left_pad="5" + layout="topleft" + follows="left|top" + name="combobox sale copy" + width="90"> + <combo_box.item + label="Copy" + name="Copy" + value="Copy" /> + <combo_box.item + label="Original" + name="Original" + value="Original" /> + </combo_box> + <spinner + follows="left|top" + decimal_digits="0" + increment="1" + control_name="Edit Cost" + name="Edit Cost" + label="Price: L$" + label_width="60" + left="10" + width="180" + min_val="1" + height="19" + max_val="999999999" + top_pad="5"/> + + <!--line_editor + border_style="line" + border_thickness="1" + follows="left|top|right" + height="16" + layout="topleft" + left_pad="5" + max_length="25" + name="EditPrice" + top_delta="0" + width="242" /--> + + <!--text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="10" name="BaseMaskDebug" top="155" width="330"> @@ -270,60 +397,8 @@ top_delta="0" width="90"> N: - </text> - <check_box - height="16" - label="Share with group" - layout="topleft" - left="10" - name="CheckShareWithGroup" - top="171" - width="106" /> - <check_box - height="16" - label="Allow anyone to copy" - layout="topleft" - left_delta="0" - name="CheckEveryoneCopy" - top_pad="16" - width="130" /> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left_delta="0" - name="NextOwnerLabel" - top_pad="16" - width="88"> - Next owner can: - </text> - <check_box - height="16" - label="Modify" - layout="topleft" - left_delta="0" - name="CheckNextOwnerModify" - top_pad="4" - width="78" /> - <check_box - height="16" - label="Copy" - layout="topleft" - left_delta="78" - name="CheckNextOwnerCopy" - top_delta="0" - width="88" /> - <check_box - height="16" - label="Resell/Give away" - layout="topleft" - left_delta="88" - name="CheckNextOwnerTransfer" - top_delta="0" - width="106" /> - <text + </text--> + <!--text type="string" length="1" follows="left|top" @@ -331,19 +406,13 @@ layout="topleft" left="10" name="SaleLabel" - top="265" + top_pad="5" width="330"> Mark Item: - </text> - <check_box - height="16" - label="For Sale" - layout="topleft" - left_delta="0" - name="CheckPurchase" - top_pad="4" - width="78" /> - <radio_group + </text--> + + + <!--radio_group draw_border="false" follows="left|top|right" height="16" @@ -368,28 +437,19 @@ name="radio2" top_delta="0" width="70" /> - </radio_group> - <text + </radio_group--> + + <!--text type="string" length="1" follows="left|top" height="16" layout="topleft" - left="42" + left="10" name="TextPrice" - top="299" - width="56"> - Price: L$ - </text> - <line_editor - border_style="line" - border_thickness="1" - follows="left|top|right" - height="16" - layout="topleft" - left_delta="56" - max_length="25" - name="EditPrice" - top_delta="0" - width="242" /> + top_pad="5" + width="78"> + Price: L$ + </text--> + </floater> diff --git a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml index 3327dc8c8b..f8f1abd179 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml @@ -83,23 +83,11 @@ <button follows="left|bottom" height="20" - label="Discard" + label="Save" label_selected="Discard" layout="topleft" left="9" - name="Discard" + name="Save" top="332" width="100" /> - <button - enabled="false" - follows="left|bottom" - height="20" - label="Keep" - label_selected="Keep" - layout="topleft" - left_pad="5" - mouse_opaque="false" - name="Keep" - top_delta="0" - width="100" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_sys_well.xml b/indra/newview/skins/default/xui/en/floater_sys_well.xml new file mode 100644 index 0000000000..468d41e2f0 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_sys_well.xml @@ -0,0 +1,99 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater + background_opaque="false" + background_visible="true" + bevel_style="in" + bg_alpha_color="0.0 0.0 0.0 0.0" + height="60" + left="0" + top="0" + follows="right|bottom" + layout="topleft" + name="notification_chiclet" + save_rect="true" + title="" + width="320" + can_minimize="false" + can_tear_off="false" + can_resize="false" + can_drag_on_left="false" + can_close="false" + can_dock="false" +> + <scroll_container + follows="top|bottom" + layout="topleft" + name="notification_list_container" + left="1" + top="30" + width="336" + height="30"> + <scrolling_panel_list + follows="left|right" + layout="topleft" + name="notification_list" + left="0" + top="0" + height="20" + width="320" /> + </scroll_container> + + <panel + top="0" + width="320" + height="30" + layout="topleft" + follows="top|left|right" + background_visible="true" + background_opaque="false" + bg_alpha_color="0.0 0.0 0.0 1.0" + name="notification_caption" + > + <text + width="255" + left="25" + height="20" + layout="topleft" + follows="left|right|top" + font="SansSerifBoldBig" + text_color="white" + word_wrap="true" + mouse_opaque="true" + name="sender_name" + > + NOTIFICATIONS + </text> + <button + top="5" + left="270" + width="15" + height="15" + layout="topleft" + follows="right" + label="" + toggle="true" + image_unselected="arrow_up.tga" + image_disabled="arrow_up.tga" + image_selected="arrow_down.tga" + image_hover_selected="arrow_down.tga" + image_disabled_selected="arrow_down.tga" + name="tear_btn" + /> + <button + top="5" + left="300" + width="15" + height="15" + layout="topleft" + follows="right" + label="" + image_unselected="closebox.tga" + image_disabled="closebox.tga" + image_selected="closebox.tga" + image_hover_selected="closebox.tga" + image_disabled_selected="closebox.tga" + name="close_btn" + /> + </panel> + +</floater> diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index c788f8f095..dd8acea4ed 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory.xml @@ -85,6 +85,22 @@ parameter="current" /> </menu_item_call> <menu_item_call + label="New Outfit" + layout="topleft" + name="New Outfit"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="outfit" /> + </menu_item_call> + <menu_item_call + label="New My Outfits" + layout="topleft" + name="New My Outfits"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="my_otfts" /> + </menu_item_call> + <menu_item_call label="New Script" layout="topleft" name="New Script"> @@ -322,6 +338,14 @@ function="Inventory.DoToSelected" parameter="change_folder_type_undershirt" /> </menu_item_call> + <menu_item_call + label="Outfit" + layout="topleft" + name="Outfit"> + <menu_item_call.on_click + function="Inventory.DoToSelected" + parameter="change_folder_type_outfit" /> + </menu_item_call> </menu> <menu_item_call label="Teleport" diff --git a/indra/newview/skins/default/xui/en/menu_nearby_chat.xml b/indra/newview/skins/default/xui/en/menu_nearby_chat.xml index 02a2f83d14..ff89e20ea5 100644 --- a/indra/newview/skins/default/xui/en/menu_nearby_chat.xml +++ b/indra/newview/skins/default/xui/en/menu_nearby_chat.xml @@ -7,7 +7,7 @@ </menu_item_call> <menu_item_separator /> - <menu_item_check bottom_delta="-18" height="18" label="Show Muted Text" left="0" mouse_opaque="true" + <menu_item_check bottom_delta="-18" height="18" label="Show Blocked Text" left="0" mouse_opaque="true" name="muted_text" width="128"> <menu_item_check.on_click function="NearbyChat.Action" userdata="muted_text" /> <menu_item_check.on_check function="NearbyChat.Check" userdata="muted_text"/> diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 44565333e5..40847b28fe 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -205,7 +205,7 @@ function="Floater.Toggle" parameter="active_speakers" /> </menu_item_check> - <menu_item_check + <!--menu_item_check label="Block List" layout="topleft" name="Mute List"> @@ -215,7 +215,7 @@ <menu_item_check.on_click function="Floater.Toggle" parameter="mute" /> - </menu_item_check> + </menu_item_check--> <menu_item_separator layout="topleft" /> <menu_item_check @@ -930,7 +930,7 @@ </menu> </menu> <menu - label="Geek" + label="Advanced" layout="topleft" name="Advanced" tear_off="true" @@ -1824,6 +1824,18 @@ function="Advanced.ShowDebugSettings" parameter="all" /> </menu_item_call> + <menu_item_check + label="Debug (QA) Mode" + layout="topleft" + name="Debug Mode" + shortcut="control|alt|Q"> + <menu_item_check.on_check + function="CheckControl" + parameter="QAMode" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="QAMode" /> + </menu_item_check> </menu> <menu create_jump_keys="true" diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index 4c880f6dc0..91039539f9 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -127,8 +127,8 @@ <split_button.item image_selected="camera_presets/camera_presets_34_view.png" image_unselected="camera_presets/camera_presets_34_view.png" - name="3/4_view" - tool_tip="3/4 View" + name="group_view" + tool_tip="Group View" /> <split_button.item image_selected="camera_presets/camera_presets_fron_view.png" diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml index 71b5f78d59..b9a384bf8f 100644 --- a/indra/newview/skins/default/xui/en/panel_group_general.xml +++ b/indra/newview/skins/default/xui/en/panel_group_general.xml @@ -4,6 +4,7 @@ follows="all" height="514" label="General" + class="panel_group_general" layout="topleft" left="1" name="general_tab" @@ -42,6 +43,7 @@ Hover your mouse over the options for more help. <line_editor follows="left|top" font="SansSerifSmall" + prevalidate_callback="asci" halign="left" height="16" label="Type your new group name here" diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml new file mode 100644 index 0000000000..4f179d7a16 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml @@ -0,0 +1,88 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> + +<panel + follows="left|top|right|bottom" + height="660" + label="Group Info" + layout="topleft" + name="panel_group_info" + border="false" + width="300"> + <panel.string + name="default_needs_apply_text"> + There are unapplied changes on the current tab. + </panel.string> + <panel.string + name="want_apply_text"> + Do you want to apply these changes? + </panel.string> + + <button + layout="topleft" + name="back" + left="5" + top="5" + width="20" + height="20" + label="" + follows="top|left" + image_selected="navbar_bg_button.tga" + image_unselected="navbar_bg_button.tga" + image_overlay="navbar_back.tga"/> + <text + layout="topleft" + top="5" + left_pad="15" + width="200" + height="20" + font="SansSerifBold" + text_color="white" + follows="top|left|right" + mouse_opaque="true" + name="group_name">(Loading...)</text> + <button + top="632" + height="20" + font="SansSerifSmall" + label="Apply" + label_selected="Apply" + name="btn_apply" + left="5" + width="65" /> + <button + top="632" + left="75" + height="20" + ont="SansSerifSmall" + label="Refresh" + label_selected="Refresh" + name="btn_refresh" + follows="top|left" + width="65" /> + <button + top="632" + height="20" + font="SansSerifSmall" + label="Create" + label_selected="Create" + name="btn_create" + left="5" + visible="false" + width="65" /> + <accordion layout="topleft" left="2" width="296" top="28" height="600" follows="all" name="panel_me_profile"> + <accordion_tab min_height="515" title="Group General" name="group_general_tab"> + <panel class="panel_group_general" filename="panel_group_general.xml" name="group_general_tab_panel"/> + </accordion_tab> + <accordion_tab min_height="380" title="Group Roles" name="group_roles_tab" can_resize="false"> + <panel class="panel_group_roles" filename="panel_group_roles.xml" name="group_roles_tab_panel"/> + </accordion_tab> + <accordion_tab min_height="530" title="Group Notices" name="group_notices_tab" can_resize="false"> + <panel class="panel_group_notices" filename="panel_group_notices.xml" name="group_notices_tab_panel"/> + </accordion_tab> + <accordion_tab min_height="270" title="Group Land Money" name="group_land_tab" can_resize="false"> + <panel class="panel_group_land_money" filename="panel_group_land_money.xml" name="group_land_tab_panel"/> + </accordion_tab> + </accordion> + + +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml index b96421ca2f..c52994b43d 100644 --- a/indra/newview/skins/default/xui/en/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/en/panel_group_land_money.xml @@ -2,7 +2,7 @@ <panel border="true" follows="all" - height="514" + height="420" label="Land & L$" layout="topleft" left="1" @@ -281,7 +281,7 @@ bg_readonly_color="0.784314 0.819608 0.8 1" follows="all" font="Monospace" - height="150" + height="180" layout="topleft" left="8" max_length="4096" diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml index dd6cd8c95e..132c06d028 100644 --- a/indra/newview/skins/default/xui/en/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel border="true" - height="530" + height="380" label="Members & Roles" layout="topleft" left="1" name="roles_tab" - top="530" width="280"> <panel.string name="default_needs_apply_text"> @@ -31,7 +30,7 @@ --> <panel follows="left|top" - height="24" + height="80" layout="topleft" left="10" name="members_header" @@ -174,7 +173,7 @@ left_delta="0" name="roles_tab_container" tab_position="top" - top="70" + top="80" width="265"> <panel border="true" @@ -185,6 +184,7 @@ name="members_sub_tab" tool_tip="Members" top="16" + class="panel_group_members_subtab" width="265"> <panel.string name="help_text"> @@ -279,6 +279,7 @@ clicking on their names. layout="topleft" left_delta="0" name="roles_sub_tab" + class="panel_group_roles_subtab" top_delta="0" width="265"> <panel.string @@ -384,6 +385,7 @@ including the Everyone and Owner Roles. layout="topleft" left_delta="0" name="actions_sub_tab" + class="panel_group_actions_subtab" top_delta="0" width="265"> <panel.string diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml index 4904a0d40a..8d90c6ebf0 100644 --- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml @@ -8,118 +8,124 @@ layout="topleft" name="navigation_bar" width="600"> - <button - follows="left|top" - font="SansSerifSmall" - height="23" - image_disabled="PushButton_Disabled" - image_disabled_selected="PushButton_Disabled" - image_overlay="Arrow_Left_Off" - image_selected="PushButton_Selected" - image_unselected="PushButton_Off" - hover_glow_amount="0.15" - layout="topleft" - left="10" - name="back_btn" - picture_style="true" - tool_tip="Go back to previous location" - top="8" - width="31" /> - - <button - follows="left|top" - font="SansSerifSmall" - height="23" - image_disabled="PushButton_Disabled" - image_disabled_selected="PushButton_Disabled" - image_overlay="Arrow_Right_Off" - image_selected="PushButton_Selected" - image_unselected="PushButton_Off" - hover_glow_amount="0.15" - layout="topleft" - left_pad="0" - name="forward_btn" - picture_style="true" - tool_tip="Go forward one location" - top_delta="0" - width="31" /> - <button - follows="left|top" - font="SansSerifSmall" - height="23" - image_disabled="PushButton_Disabled" - image_disabled_selected="PushButton_Disabled" - image_overlay="Home_Off" - image_selected="PushButton_Selected" - image_unselected="PushButton_Off" - hover_glow_amount="0.15" - layout="topleft" - left_pad="7" - name="home_btn" - picture_style="true" - tool_tip="Teleport to your home location" - top_delta="0" - width="32" /> - <location_input - follows="left|right|top" - halign="right" - height="22" - label="Location" - layout="topleft" - left_pad="7" - max_chars="254" - mouse_opaque="false" - name="location_combo" - top_delta="0" - width="266"> - <!-- *TODO: Delete. Let the location_input use the correct art sizes. - <location_input.add_landmark_button - height="18" - name="location_combo_add" - width="20" /> - <location_input.info_button - height="18" - name="location_combo_info" - width="20" /> - --> - </location_input> - -<!-- <button --> -<!-- follows="right|top" --> -<!-- height="20" --> -<!-- image_disabled="TextField_Search_Off" --> -<!-- image_disabled_selected="TextField_Search_Off" --> -<!-- image_hover_selected="TextField_Search_Off" --> -<!-- image_hover_unselected="TextField_Search_Off" --> -<!-- image_selected="TextField_Search_Off" --> -<!-- image_unselected="TextField_Search_Off" --> -<!-- layout="topleft" --> -<!-- left_pad="5" --> -<!-- mouse_opaque="false" --> -<!-- name="search_bg" --> -<!-- picture_style="true" --> -<!-- top_delta="0" --> -<!-- width="168" /> --> - - <search_editor - bevel_style="none" - border_style="line" - border.border_thickness="0" - commit_on_focus_lost="false" - follows="right|top" - halign="right" - height="22" - label="Search All" - layout="topleft" - left_pad="7" - mouse_opaque="false" - name="search_input" - tool_tip="Search All" - top_delta="0" - width="200" /> - - - + <panel + background_visible="false" + follows="left|top|right" + height="60" + layout="topleft" + name="navigation_panel" + width="600"> + <button + follows="left|top" + font="SansSerifSmall" + height="23" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_overlay="Arrow_Left_Off" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" + layout="topleft" + left="10" + name="back_btn" + picture_style="true" + tool_tip="Go back to previous location" + top="3" + width="31" /> + + <button + follows="left|top" + font="SansSerifSmall" + height="23" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_overlay="Arrow_Right_Off" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" + layout="topleft" + left_pad="0" + name="forward_btn" + picture_style="true" + tool_tip="Go forward one location" + top_delta="0" + width="31" /> + <button + follows="left|top" + font="SansSerifSmall" + height="23" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_overlay="Home_Off" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" + layout="topleft" + left_pad="7" + name="home_btn" + picture_style="true" + tool_tip="Teleport to your home location" + top_delta="0" + width="32" /> + <location_input + follows="left|right|top" + halign="right" + height="22" + label="Location" + layout="topleft" + left_pad="7" + max_chars="254" + mouse_opaque="false" + name="location_combo" + top_delta="0" + width="266"> + <!-- *TODO: Delete. Let the location_input use the correct art sizes. + <location_input.add_landmark_button + height="18" + name="location_combo_add" + width="20" /> + <location_input.info_button + height="18" + name="location_combo_info" + width="20" /> + --> + </location_input> + + <!-- <button --> + <!-- follows="right|top" --> + <!-- height="20" --> + <!-- image_disabled="TextField_Search_Off" --> + <!-- image_disabled_selected="TextField_Search_Off" --> + <!-- image_hover_selected="TextField_Search_Off" --> + <!-- image_hover_unselected="TextField_Search_Off" --> + <!-- image_selected="TextField_Search_Off" --> + <!-- image_unselected="TextField_Search_Off" --> + <!-- layout="topleft" --> + <!-- left_pad="5" --> + <!-- mouse_opaque="false" --> + <!-- name="search_bg" --> + <!-- picture_style="true" --> + <!-- top_delta="0" --> + <!-- width="168" /> --> + + <search_editor + bevel_style="none" + border_style="line" + border.border_thickness="0" + commit_on_focus_lost="false" + follows="right|top" + halign="right" + height="22" + label="Search All" + layout="topleft" + left_pad="7" + mouse_opaque="false" + name="search_input" + tool_tip="Search All" + top_delta="0" + width="200" /> + </panel> + <favorites_bar follows="left|right|top" height="25" diff --git a/indra/newview/skins/default/xui/en/panel_notes.xml b/indra/newview/skins/default/xui/en/panel_notes.xml index a0ac9df8a5..e616389c36 100644 --- a/indra/newview/skins/default/xui/en/panel_notes.xml +++ b/indra/newview/skins/default/xui/en/panel_notes.xml @@ -1,205 +1,121 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - follows="top|left|right|bottom" bevel_style="in" - height="625" - label="Notes and Privacy" + follows="left|top|right|bottom" + height="570" + width="295" + border="false" layout="topleft" - left="10" - name="panel_notes" - top="10" - width="305"> + left="0" + top="0" + label="Notes & Privacy" + name="panel_notes"> <scroll_container - left="8" - width="260" - height="570" + color="DkGray2" follows="left|top|right|bottom" + height="570" + width="265" layout="topleft" - name="profile_scroll" + left="5" + top_pad="0" + bevel_style="in" opaque="true" - color="DkGray2" + name="profile_scroll" reserve_scroll_corner="false"> - <panel - layout="topleft" - width="260" - height="530" - left="0" - follows="left|right" - top="0"> - <!-- <text - type="string" - length="1" - follows="left|top" - font="SansSerifHugeBold" - height="20" - layout="topleft" - left="10" - name="pick_title" - text_color="white" - top="10" - width="250" - word_wrap="true"> - Private Notes - </text>--> <text type="string" length="1" follows="left|top" font="SansSerifBold" - height="15" - layout="topleft" - left="10" + height="16" + width="225" + left="0" name="status_message" - text_color="White" - top="20" - width="260"> - Your private notes: + text_color="white" + top=""> + My private notes: </text> <text_editor - bg_focus_color="LtGray" - bg_writeable_color="LtGray" - follows="left|right" - font="SansSerif" height="200" + follows="left|top" + width="243" hide_scrollbar="true" - layout="topleft" left="10" max_length="1000" name="notes_edit" text_color="black" top_pad="10" - width="240" word_wrap="true" /> - <!-- <text - type="string" - length="1" - follows="left|top" - font="SansSerifHugeBold" - height="20" - layout="topleft" - left="10" - name="pick_title2" - text_color="white" - top_pad="10" - width="250" - word_wrap="true"> - Private Settings - </text> --> <text type="string" length="1" follows="left|top" font="SansSerifBold" - height="15" - layout="topleft" + height="16" + width="225" left="10" name="status_message2" text_color="white" - top_pad="30" - width="260"> - Allow this user to: + top_pad="30"> + Let this person: </text> <check_box enabled="false" follows="left|top" - font="SansSerif" + width="230" height="20" label="See my online status" - layout="topleft" - left="10" - name="status_check" - text_disabled_color="0.1 0.1 0.1 1" - text_enabled_color="white" + left="20" top_pad="10" - width="260" /> + name="status_check" /> <check_box enabled="false" follows="left|top" - font="SansSerif" + width="230" height="20" label="See me on the map" - layout="topleft" - left="10" - name="map_check" - text_disabled_color="0.1 0.1 0.1 1" - text_enabled_color="white" + left="20" top_pad="10" - width="260" /> + name="map_check"/> <check_box enabled="false" follows="left|top" - font="SansSerif" + width="230" height="20" label="Edit, delete or take my objects" - layout="topleft" - left="10" - name="objects_check" - text_disabled_color="0.1 0.1 0.1 1" - text_enabled_color="white" + left="20" top_pad="10" - width="260" /> - </panel> + name="objects_check" /> </scroll_container> <panel - layout="topleft" - follows="bottom" + follows="bottom|left" height="30" - left="8" - name="notes_buttons_panel" - bottom="625" - width="280"> - <button - follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="Add Friend" - layout="topleft" - left="0" - mouse_opaque="false" - name="add_friend" - top="0" - width="90" /> - <button - follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="IM" - layout="topleft" - left_pad="0" - name="im" - top="0" - width="40" /> - <button - follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="Call" - layout="topleft" - left_pad="0" - name="call" - top="0" - width="50" - enabled="false"/> + width="280" + layout="topleft" + left="10" + top_pad="5" + name="notes_buttons_panel"> <button follows="bottom|left" font="SansSerifSmallBold" height="25" label="Teleport" layout="topleft" - left_pad="0" - name="teleport" + left="0" + name="teleport_btn" + enabled="false" top="0" width="75" /> <button follows="bottom|left" font="SansSerifSmallBold" height="25" - label="Share" + label="Show on Map" layout="topleft" left_pad="0" - name="share" + name="show_on_map_btn" + enabled="false" top="0" - width="60" - enabled="false"/> + width="105" /> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index 6b3f5eaee1..bccc04e30c 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -1,28 +1,30 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel layout="topleft" + font="SansSerifBigBold" top="0" left="0" width="305" height="465" - follows="left|top|right|bottom" - background_visible="true" + follows="left|top|right|bottom" + background_visible="true" + bg_alpha_color="DkGray2" + bevel_style="in" label="People" name="people_panel"> <filter_editor layout="topleft" top="3" - left="15" - width="270" - height="20" + left="10" + width="256" + height="23" follows="left|top|right" max_length="270" - label="Filter People" name="filter_input" font="SansSerif" background_image="TextField_Search_Off" text_pad_left="23" - text_color="black"/> + text_color="black" /> <button name="people_search" layout="topleft" @@ -39,8 +41,8 @@ <tab_container layout="topleft" top="30" - left="10" - width="280" + left="10" + width="295" height="400" follows="left|top|right|bottom" name="tabs" @@ -50,8 +52,8 @@ height="390" width="280" follows="left|top|right|bottom" - background_visible="true" - bevel_style="bright" + background_visible="false" + bevel_style="none" label="Nearby" name="nearby_panel"> <avatar_list @@ -62,7 +64,7 @@ height="357" follows="left|top|right|bottom" name="avatar_list" - volume_column_width="20"/> + volume_column_width="20"/> <panel layout="topleft" bottom="390" @@ -71,7 +73,7 @@ height="30" follows="left|right|bottom" background_visible="true" - bevel_style="bright" + bevel_style="none" label="bottom_panel" name="bottom_panel"> <button @@ -96,7 +98,7 @@ width="280" follows="left|top|right|bottom" background_visible="true" - bevel_style="bright" + bevel_style="none" label="Friends" name="friends_panel"> <avatar_list @@ -115,7 +117,7 @@ height="30" follows="left|right|bottom" background_visible="true" - bevel_style="in" + bevel_style="none" label="bottom_panel" name="bottom_panel"> <button @@ -163,10 +165,10 @@ <panel layout="topleft" height="390" - width="280" + width="280" follows="left|top|right|bottom" background_visible="true" - bevel_style="bright" + bevel_style="none" label="Groups" name="groups_panel"> <group_list @@ -185,7 +187,7 @@ height="30" follows="left|right|bottom" background_visible="true" - bevel_style="in" + bevel_style="none" label="bottom_panel" name="bottom_panel"> <button @@ -240,7 +242,7 @@ hover_glow_amount="0.15" image_selected="TrashItem_Press" image_unselected="TrashItem_Off" - picture_style="true"/> + picture_style="true"/> </panel> </panel> <panel @@ -249,8 +251,8 @@ width="280" follows="left|top|right|bottom" background_visible="true" - bevel_style="bright" - label="Recent" + bevel_style="none" + label="History" name="recent_panel"> <avatar_list layout="topleft" @@ -268,7 +270,7 @@ height="30" follows="left|right|bottom" background_visible="true" - bevel_style="in" + bevel_style="none" label="bottom_panel" name="bottom_panel"> <button @@ -293,7 +295,7 @@ follows="left|right|bottom" bottom="6" left="6" - width="280" + width="295" height="27" orientation="horizontal" animate="false" @@ -478,7 +480,7 @@ follows="top|right" font="SansSerifSmallBold"/> </layout_panel> - </layout_stack> + </layout_stack> <string name="no_people"> No people </string> @@ -491,4 +493,10 @@ <string name="no_groups"> No groups </string> + <string name="people_filter_label"> + Filter People + </string> + <string name="groups_filter_label"> + Filter Groups + </string> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml index 393521f1d2..1425246540 100644 --- a/indra/newview/skins/default/xui/en/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml @@ -1,24 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel + follows="left|top|right|bottom" bevel_style="in" - height="660" + height="625" + width="280" layout="topleft" left="0" name="panel_pick_info" - top="0" - width="305"> - <button - follows="top|left" - height="20" - image_overlay="navbar_back.tga" - image_selected="navbar_bg_button.tga" - image_unselected="navbar_bg_button.tga" - layout="topleft" - left="10" - name="back_btn" - picture_style="true" - top="5" - width="20" /> + top="0"> <text type="string" length="1" @@ -33,15 +22,24 @@ width="150"> Pick Info </text> + <button + follows="top|right" + right="-25" + top="10" + width="20" + height="20" + image_overlay="BackArrow_Off" + layout="topleft" + name="back_btn" + picture_style="true" /> <panel follows="left|right|top|bottom" - height="580" + min_height="300" width="280" layout="topleft" background_visible="true" bg_alpha_color="DkGray2" left="10" - right="-10" top="30"> <texture_picker enabled="false" diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml index 1a06e2bb06..78bec6035f 100644 --- a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml @@ -1,63 +1,57 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - bg_alpha_color="0.4 0.4 0.4 1" - bg_opaque_color="0.4 0.4 0.4 1" - border="true" - follows="top|left|right" - height="80" - layout="topleft" + border="false" + follows="top|left|right|bottom" + top="0" left="0" - name="picture_item" - top="80" - width="245"> + height="100" + width="265" + name="picture_item"> <texture_picker allow_no_texture="true" default_image_name="None" enabled="false" follows="left|top" - height="80" + height="100" + width="100" layout="topleft" - left="5" + left="10" + bottom_pad="10" mouse_opaque="false" name="picture" tab_stop="false" - top="7" - width="70" /> + top="10" /> <text follows="top|left|right" - font="SansSerif" - height="20" + font="SansSerifTiny" + height="16" layout="topleft" - left="80" + left="120" name="picture_name" - text_color="black" - top="5" + top="10" + text_color="white" use_ellipses="true" - width="150"/> + width="120" /> <text follows="top|left|right" - font="SansSerifSmall" - height="40" + font="SansSerifTiny" + height="60" + width="140" + top_pad="0" layout="topleft" name="picture_descr" - text_color="white" - top="25" use_ellipses="true" - width="150" word_wrap="true" /> <button follows="top|right" - height="20" - image_disabled="navbar_bg_button.tga" - image_disabled_selected="navbar_bg_button.tga" - image_overlay="navbar_forward.tga" - image_selected="navbar_bg_button.tga" - image_unselected="navbar_bg_button.tga" + height="16" + image_selected="Info" + image_unselected="Info" layout="topleft" name="info_chevron" picture_style="true" - right="-5" tab_stop="false" - top="28" - width="20" /> + top="6" + left="233" + width="16" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml index 5b66026f48..2be9f900da 100644 --- a/indra/newview/skins/default/xui/en/panel_picks.xml +++ b/indra/newview/skins/default/xui/en/panel_picks.xml @@ -2,78 +2,64 @@ <panel bevel_style="in" follows="left|top|right|bottom" - height="625" - label="Picks" + height="570" + width="295" + border="false" layout="topleft" left="0" - name="panel_picks" top="0" - width="305"> - <!--<text - type="string" - length="1" - follows="top|left|right" - font="SansSerifHugeBold" - height="50" + label="Picks" + name="panel_picks"> + <scroll_container + color="DkGray2" + follows="left|top|right|bottom" + height="570" + width="265" layout="topleft" - left="10" - name="pick_title" - text_color="white" - top="10" - width="270" - word_wrap="true"> - [NAME]'s favorite places in Second Life... - </text>--> - <!-- below is a special title shown for the Agent on the "Picks" tab--> + left="5" + top_pad="0" + bevel_style="in" + opaque="true" + name="profile_scroll" + reserve_scroll_corner="false"> +<!-- below is a special title shown for the Agent on the "Picks" tab <text type="string" length="1" follows="top" font="SansSerifBold" height="35" + width="250" layout="topleft" left="10" name="pick_title_agent" text_color="white" - top="10" - visible="false" - width="270" + top_pad="25" + visible="false" word_wrap="true"> Tell everyone about your favorite Second Life places... - </text> - <scroll_container - follows="left|top|right|bottom" - height="495" - layout="topleft" - left="8" - name="profile_scroll" - opaque="true" - color="DkGray2" - reserve_scroll_corner="false" - top_pad="0" - width="260"> + </text>--> <panel - bevel_style="in" - height="40" + height="115" + width="265" layout="topleft" left="0" name="back_panel" - top="0" - width="260" /> + top="0" /> </scroll_container> - <panel + <panel background_visible="true" - bevel_style="in" + bevel_style="none" enabled="false" follows="left|right|bottom" - height="25" + height="30" label="bottom_panel" layout="topleft" - left="8" + left="0" name="edit_panel" visible="false" top_pad="0" - width="260"> + width="280"> <button enabled="false" follows="bottom|left" @@ -123,29 +109,18 @@ <panel follows="bottom|left" height="30" + width="280" layout="topleft" - left="8" - name="buttons_cucks" - bottom="625" - width="280"> - <button - follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="Info" - layout="topleft" - left="0" - name="info_btn" - enabled="false" - top="0" - width="60" /> + left="10" + top_pad="5" + name="buttons_cucks"> <button follows="bottom|left" font="SansSerifSmallBold" height="25" label="Teleport" layout="topleft" - left_pad="0" + left="0" name="teleport_btn" enabled="false" top="0" @@ -161,16 +136,5 @@ enabled="false" top="0" width="105" /> - <button - enabled="false" - follows="bottom|right" - font="SansSerifSmallBold" - height="25" - label="Verb" - layout="topleft" - left_pad="0" - name="verb_btn" - top="0" - width="60" /> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml index 13efa7bcff..c154c5d21e 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml @@ -13,24 +13,15 @@ <!-- ADVANCED --> - <check_box - control_name="SmallAvatarNames" - height="16" - initial_value="true" - label="Small Avatar Names" - layout="topleft" - left_delta="30" - name="small_avatar_names_checkbox" - top="20" - width="200" /> + <check_box control_name="ArrowKeysMoveAvatar" height="16" label="Arrow keys always move avatar when chatting" layout="topleft" - left_delta="0" + left_delta="30" name="arrow_keys_move_avatar_check" - top_pad="10" + top="20" width="237" /> <text type="string" @@ -253,6 +244,17 @@ name="first_person_avatar_visible" top_delta="0" width="256" /> + + <check_box + control_name="UseChatBubbles" + height="16" + label="Show chat bubbles" + layout="topleft" + left="30" + name="bubble_text_chat" + top_pad="5" + width="400" /> + </panel>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml index 89d96b015f..f4696152f9 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml @@ -278,15 +278,6 @@ top_pad="40" width="400" /> <check_box - control_name="UseChatBubbles" - height="16" - label="Show chat bubbles" - layout="topleft" - left_delta="0" - name="bubble_text_chat" - top_pad="5" - width="400" /> - <check_box enabled="false" height="16" label="Email me IMs when I'm offline" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml index 2d42757150..95d8d2ce2a 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml @@ -263,13 +263,23 @@ name="show_my_name_checkbox" top_pad="5" width="300" /> + <check_box + control_name="SmallAvatarNames" + height="16" + initial_value="true" + label="Small name tags" + layout="topleft" + left_delta="175" + name="small_avatar_names_checkbox" + top_delta="0" + width="200" /> <check_box enabled_control="AvatarNameTagMode" control_name="RenderShowGroupTitleAll" height="16" label="Show group titles" layout="topleft" - left_delta="0" + left_delta="-175" name="show_all_title_checkbox" top_pad="5" width="300" /> diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml index 2b21c05283..2a49db8d4f 100644 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_profile.xml @@ -2,21 +2,22 @@ <panel bevel_style="in" follows="left|top|right|bottom" - height="625" - label="Profile" + height="570" + width="295" + border="false" layout="topleft" - left="10" + left="0" + top="0" + label="Profile" mouse_opaque="false" - name="panel_profile" - top="10" - width="305"> + name="panel_profile"> <panel.string name="CaptionTextAcctInfo"> [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION] </panel.string> <panel.string name="AcctTypeResident"> - Resident. + Resident </panel.string> <panel.string name="AcctTypeTrial"> @@ -70,51 +71,41 @@ color="DkGray2" follows="left|top|right|bottom" height="570" + width="265" layout="topleft" - left="8" - name="profile_scroll" + left="5" + top_pad="0" + border="false" opaque="true" - reserve_scroll_corner="false" - width="260"> + name="profile_scroll" + reserve_scroll_corner="false"> <panel - height="680" + height="300" layout="topleft" left="0" top="0" - width="280"> - <text - type="string" - follows="top|left|right" - font="SansSerifHugeBold" - height="20" - layout="topleft" - left="9" - name="user_name" - text_color="white" - top="0" - mouse_opaque="true" - width="250"> - (Loading...) - </text> + bevel_style="in" + width="265"> <panel follows="left|top" height="100" layout="topleft" left="10" + bevel_style="in" name="second_life_image_panel" top="20" - width="250"> + width="230"> <texture_picker allow_no_texture="true" default_image_name="None" enabled="false" follows="top|left" - height="100" + height="125" layout="topleft" left="0" name="2nd_life_pic" top="0" - width="100" /> + width="125" /> <text type="string" follows="left|top" @@ -130,12 +121,12 @@ </text> <text type="string" - top_pad="4" + left_pad="10" + top_pad="5" follows="left|top|right" font="SansSerifSmall" - height="75" + height="125" layout="topleft" - left_delta="0" name="sl_description_edit" text_color="LtGray" width="125" @@ -147,7 +138,7 @@ follows="left|top" height="100" layout="topleft" - left="10" + left="10" name="first_life_image_panel" top_pad="20" width="125"> @@ -156,12 +147,12 @@ default_image_name="None" enabled="false" follows="top|left" - height="100" + height="125" layout="topleft" left="0" name="real_world_pic" top_pad="0" - width="100" /> + width="125" /> <text type="string" follows="left|top" @@ -179,9 +170,9 @@ type="string" follows="left|top|right" font="SansSerifSmall" - height="45" + height="125" layout="topleft" - left_delta="0" + left_pad="10" top_pad="10" name="fl_description_edit" text_color="LtGray" @@ -190,63 +181,20 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. </text> </panel> - <text - type="string" - follows="left|top" - font="SansSerifBold" - height="15" - layout="topleft" - halign="right" - left="10" - name="title_groups_text" - text_color="white" - top_pad="20" - width="100"> - Groups: - </text> - <text + <link type="string" follows="left|top|right" font="SansSerifSmall" - height="45" - layout="topleft" - left_pad="10" - top_delta="0" - name="sl_groups" - text_color="LtGray" - width="125" - word_wrap="true"> - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. - </text> - <text - type="string" - follows="left|top" - font="SansSerifBold" height="15" - halign="right" - layout="topleft" - left="10" - name="title_homepage_text" - text_color="white" top_pad="20" - width="100"> - Homepage: - </text> - <text - type="string" - follows="left|top|right" - font="SansSerifSmall" - font.style="UNDERLINE" - font_shadow="hard" - height="15" - top_delta="0" layout="topleft" - left_pad="10" + left="10" name="homepage_edit" - text_color="0.2 0.2 1 1" - width="125"> + text_color="HTMLLinkColor" + hover_color="0.5 0.4 1 1" + width="280"> TODO - </text> + </link> <text type="string" follows="left|top" @@ -287,7 +235,7 @@ name="title_acc_status_text" text_color="white" width="100"> - Account status: + Status: </text> <text type="string" @@ -339,65 +287,88 @@ word_wrap="true"> [FIRST] [LAST] </text> - <text + <link type="string" follows="top|right" font="SansSerifSmall" - font.style="UNDERLINE" - font_shadow="hard" height="15" layout="topleft" left_delta="0" name="partner_edit_link" - text_color="0.2 0.2 1 1" + text_color="HTMLLinkColor" + hover_color="0.5 0.4 1 1" top_delta="15" width="40"> Edit - </text> + </link> </panel> - - <panel + <text + type="string" + follows="left|top" + font="SansSerifBold" + height="15" + layout="topleft" + halign="right" + left="10" + name="title_groups_text" + text_color="white" + top_pad="20" + width="100"> + Groups: + </text> + <text + type="string" + follows="left|top|right|bottom" + font="SansSerifSmall" + height="120" + layout="topleft" + left_pad="10" + top_delta="0" + name="sl_groups" + text_color="LtGray" + width="125" + word_wrap="true"> + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. + </text> + <!--panel follows="left|top|right" height="15" layout="topleft" left="50" - top_pad="40" + top_pad="30" name="account_actions_panel" width="200"> - <text + <link type="string" follows="left|top" font="SansSerif" - font.style="UNDERLINE" - font_shadow="hard" height="15" layout="topleft" left="0" name="payment_update_link" - text_color="0.2 0.2 1 1" + text_color="HTMLLinkColor" + hover_color="0.5 0.4 1 1" top="0" width="100"> Update - </text> - <text - type="string" + </link> + <link follows="left|top" font="SansSerif" - font.style="UNDERLINE" - font_shadow="hard" height="15" layout="topleft" left="70" name="my_account_link" - text_color="0.2 0.2 1 1" + text_color="HTMLLinkColor" + hover_color="0.5 0.4 1 1" top="0" width="80"> My Account - </text> - </panel> - - - + </link> + </panel--> + + + <!-- <panel follows="left|top|right" @@ -431,14 +402,14 @@ TBD </text> </panel> --> - <panel + <!--panel follows="left|top|right" height="80" layout="topleft" left="0" name="status_me_panel" top_pad="20" - width="250"> + width="125"> <text type="string" follows="left|top" @@ -499,25 +470,25 @@ name="status_me_message_edit" select_on_focus="true" text_color="0.5 0.5 0.5 1" - width="250"> + width="230"> Type a message about what you're doing in SL! </line_editor> + </panel--> + + + + </panel> - - - - - </panel> - + </scroll_container> <panel - bottom="625" follows="bottom|left" height="30" + width="280" layout="topleft" - left="8" - name="profile_buttons_panel" - width="280"> + left="10" + top_pad="5" + name="profile_buttons_panel"> <button follows="bottom|left" font="SansSerifSmallBold" @@ -560,7 +531,7 @@ name="teleport" top="0" width="75" /> - <button + <!-- <button enabled="false" follows="bottom|left" font="SansSerifSmallBold" @@ -570,17 +541,17 @@ left_pad="0" name="share" top="0" - width="60" /> - </panel> + width="60" />--> + </panel> <panel - bottom="625" follows="bottom|left" height="30" + width="280" layout="topleft" - left="8" - name="profile_me_buttons_panel" + left="10" + top_pad="5" visible="false" - width="345"> + name="profile_me_buttons_panel"> <button follows="bottom|left" font="SansSerifSmallBold" @@ -601,5 +572,5 @@ name="edit_appearance_btn" top="0" width="130" /> - </panel> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml index 2466480d16..a14d8bbc6b 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_view.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml @@ -2,63 +2,76 @@ <panel background_visible="true" follows="left|top|right|bottom" - height="660" + width="305" + height="650" label="Profile" + bevel_style="in" layout="topleft" left="0" name="panel_target_profile" - top="0" - width="250"> - <button - layout="topleft" - name="back" - left="5" - top="5" - width="20" - height="20" - label="" - tab_stop="false" - follows="top|left" - image_selected="navbar_bg_button.tga" - image_unselected="navbar_bg_button.tga" - image_overlay="navbar_back.tga"/> - <text - layout="topleft" - top="0" - left_pad="15" - width="125" - height="20" - font="SansSerifHugeBold" - text_color="white" + top="0"> + <text + layout="topleft" + top="0" + left="10" + width="250" + height="20" + font="SansSerifHugeBold" + text_color="white" follows="top|left|right" - mouse_opaque="true" + mouse_opaque="true" name="user_name">(Loading...)</text> + <text + layout="topleft" + width="100" + height="16" + left="10" + top_pad="5" + font="SansSerifTiny" + text_color="LtGray_50" + follows="top|left" + mouse_opaque="true" + name="status">Online</text> + <button + layout="topleft" + name="back" + right="-10" + top="0" + width="25" + height="25" + label="" + tab_stop="false" + follows="top|right" + image_selected="" + image_unselected="" + image_overlay="BackArrow_Off" /> <tab_container follows="left|top|right|bottom" - height="625" + height="550" + width="306" + tab_min_width="75" layout="topleft" - left="0" + left="10" name="tabs" tab_position="top" - top="35" - width="280"> + top_pad="20"> <panel class="panel_profile" filename="panel_profile.xml" label="Profile" layout="topleft" - name="panel_profile"/> + name="panel_profile" /> <panel class="panel_picks" filename="panel_picks.xml" label="Picks" layout="topleft" - name="panel_picks"/> + name="panel_picks" /> <panel class="panel_notes" filename="panel_notes.xml" - label="Notes" + label="Notes & Privacy" layout="topleft" - name="panel_notes"/> + name="panel_notes" /> </tab_container> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml index 8953633276..58be74a598 100644 --- a/indra/newview/skins/default/xui/en/panel_side_tray.xml +++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml @@ -50,9 +50,16 @@ filename="panel_profile_view.xml" border="true" /> + <panel + class="panel_group_info_sidetray" + name="panel_group_info_sidetray" + filename="panel_group_info_sidetray.xml" + label="Group Info" + border="true" + /> + </panel_container> </sidetray_tab> - <!-- *TODO Vadim: isn't the sidetray_tab "label" attribute redundant since we have "tab_title" ? --> <sidetray_tab name="sidebar_places" tab_title="Places" @@ -67,7 +74,7 @@ class="panel_places" name="panel_places" filename="panel_places.xml" - label="Places" + label="Places" border="true" /> </sidetray_tab> @@ -82,94 +89,14 @@ bg_opaque_color="0.5 0.5 0.5 1.0" > <panel - class="panel_me_profile" + class="panel_me_profile_view" name="panel_me_profile" filename="panel_me_profile.xml" label="Me" border="true" /> </sidetray_tab> - <!-- - <sidetray_tab - name="sidebar_group" - mouse_opaque="false" - background_visible="true" - bg_opaque_color="0.5 0.5 0.5 1.0" - image="icn_voice-groupfocus.tga" - tab_title="Groups" - description="Manage Groups." - > - <accordion_tab - name="group_accordion" - title="Group General" - expanded="true" - collapsible="true" - min_width="200" - min_height="200" - header_visible="true" - > - <panel - class="panel_group_general" - name="panel_group_general" - filename="panel_group_general.xml" - label="Group" - border="true" - /> - </accordion_tab> - <accordion_tab - name="groupland_accordion" - title="Group Land and Money" - expanded="false" - collapsible="true" - min_width="200" - min_height="200" - header_visible="true" - > - <panel - class="panel_group_land" - name="panel_group_land" - filename="panel_group_land_money.xml" - label="Group" - border="true" - /> - </accordion_tab> - <accordion_tab - name="groupnotices_accordion" - title="Group Notices" - expanded="false" - collapsible="true" - min_width="200" - min_height="200" - header_visible="true" - > - <panel - class="panel_group_roles" - name="panel_group_roles" - filename="panel_group_roles.xml" - label="Group" - border="true" - /> - </accordion_tab> - <accordion_tab - name="grouproles_accordion" - title="Group Roles" - expanded="false" - collapsible="true" - min_width="200" - min_height="200" - header_visible="true" - > - <panel - class="panel_group_roles" - name="panel_group_roles" - filename="panel_group_roles.xml" - label="Group" - border="true" - /> - </accordion_tab> - </sidetray_tab> - <sidetray_tab name="sidebar_previews" @@ -659,5 +586,25 @@ </sidetray_tab> --> + + <sidetray_tab + name="sidebar_appearance" + tab_title="Appearance" + description="Change your looks and appearance." + image="TabIcon_Appearance_Off" + mouse_opaque="false" + background_opaque="false" + background_visible="true" + bg_opaque_color="0.5 0.5 0.5 1.0" + > + <panel + class="panel_appearance" + name="panel_appearance" + filename="panel_appearance.xml" + border="true" + /> + </sidetray_tab> + + </side_tray> diff --git a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml index a85662603d..f10161cecd 100644 --- a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml +++ b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml @@ -85,6 +85,31 @@ mouse_opaque="false" name="tab_description" > Change your profile, your look and quick links to your outfits. </text> + </panel> + <panel + left="10" width="280" height="130" + background_visible="true" + background_opaque="false" + bg_alpha_color="0.3 0.3 0.3 1.0" + name="sidebar_appearance" + follows="left|top|right" + class="panel_sidetray_home_info"> + <text + top="-10" width="200" left="5" height="30" follows="left|right|top" + font="SansSerifHugeBold" text_color="white" word_wrap="true" + mouse_opaque="false" name="tab_name" > + Appearance + </text> + <icon + top="-10" right="-10" width="20" height="20" follows="top|right" + color="1 1 1 1" enabled="true" image_name="inv_item_shirt.tga" + mouse_opaque="false" name="tab_icon"/> + <text + top="-40" left="10" right="-10" height="120" follows="left|right|bottom" + font="SansSerifBig" text_color="white" word_wrap="true" + mouse_opaque="false" name="tab_description" > + Change your appearance. + </text> </panel> </panel>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml index 9bf401d817..82b7e02aeb 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -35,6 +35,10 @@ name="timeTooltip"> [weekday, datetime, slt], [day, datetime, slt] [month, datetime, slt] [year, datetime, slt] </panel.string> + <panel.string + name="buycurrencylabel"> + L$ [AMT] + </panel.string> <button auto_resize="true" follows="right|bottom" diff --git a/indra/newview/skins/default/xui/en/panel_sys_well_item.xml b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml new file mode 100644 index 0000000000..eccb919b04 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- All our XML is utf-8 encoded. --> + +<panel + name="sys_well_item" + title="sys_well_item" + visible="false" + top="0" + left="0" + width="318" + height="35" + layout="topleft" + follows="top" + background_opaque="false" + background_visible="true" + bg_alpha_color="0.0 0.0 0.0 0.0" > + + <icon + top="8" + left="8" + width="20" + height="20" + layout="topleft" + follows="left" + name="icon" + label="" + mouse_opaque="false" + image_name="lag_status_warning.tga" + /> + + <text + top="2" + left_pad="8" + width="255" + height="28" + layout="topleft" + follows="right|left" + font="SansSerifBold" + text_color="white" + use_ellipses="true" + word_wrap="true" + mouse_opaque="false" + name="title" > + Select your streaming media preference. Select your streaming media preference. + </text> + + <button + top="5" + left_pad="5" + width="15" + height="15" + layout="topleft" + follows="right" + name="close_btn" + mouse_opaque="true" + label="" + image_unselected="toast_hide_btn.tga" + image_disabled="toast_hide_btn.tga" + image_selected="toast_hide_btn.tga" + image_hover_selected="toast_hide_btn.tga" + image_disabled_selected="toast_hide_btn.tga" + /> + +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml index ba4915e074..f7d8cf948e 100644 --- a/indra/newview/skins/default/xui/en/panel_toast.xml +++ b/indra/newview/skins/default/xui/en/panel_toast.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <!-- All our XML is utf-8 encoded. --> -<panel +<floater name="toast" - title="toast" + title="" visible="false" layout="topleft" width="350" @@ -14,6 +14,12 @@ background_opaque="true" background_visible="true" bevel_style="in" + can_minimize="false" + can_tear_off="false" + can_resize="false" + can_drag_on_left="false" + can_close="false" + can_dock="false" bg_alpha_color="0.3 0.3 0.3 1.0"> <text @@ -62,4 +68,4 @@ image_hover_selected="toast_hide_btn.tga" image_disabled_selected="toast_hide_btn.tga" /> -</panel> +</floater> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index bc364687e9..0ed473a01a 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -320,7 +320,14 @@ <string name="GroupNotifyViewPastNotices">View past notices or opt-out of receiving these messages here.</string> <string name="GroupNotifyOpenAttachment">Open Attachment</string> <string name="GroupNotifySaveAttachment">Save Attachment</string> - + <string name="TeleportOffer">Teleport offering</string> + <!-- start-up toast's string--> + <string name="StartUpNotification">%d new notification arrived while you were away...</string> + <string name="StartUpNotifications">%d new notifications arrived while you were away...</string> + <!-- overflow toast's string--> + <string name="OverflowInfoChannelString">You have %d more notification</string> + + <!-- body parts --> <string name="BodyPartsRightArm">Right Arm</string> <string name="BodyPartsHead">Head</string> @@ -402,6 +409,8 @@ this texture in your inventory <string name="InvFolder Animations">Animations</string> <string name="InvFolder Gestures">Gestures</string> <string name="InvFolder favorite">Favorites</string> + <string name="InvFolder Current Outfit">Current Outfit</string> + <string name="InvFolder My Outfits">My Outfits</string> <!-- inventory FVBridge --> <string name="Buy">Buy</string> @@ -733,7 +742,195 @@ If you continue to receive this message, contact customer support. If you continue to receive this message, contact customer support. </string> - <!-- Group Information --> - - + <!-- Avatar Shape Information --> + <string name="Attached Earlobes">Attached Earlobes</string> + <string name="Arm Length">Arm Length</string> + <string name="Back Bangs Down">Back Bangs Down</string> + <string name="Back Bangs Up">Back Bangs Up</string> + <string name="Back Hair Down">Back Hair Down</string> + <string name="Back Hair Up">Back Hair Up</string> + <string name="Belly Size">Belly Size</string> + <string name="Blonde Hair">Blonde Hair</string> + <string name="Big Eyeball">Big Eyeball</string> + <string name="Big Hair Back">Big Hair Back</string> + <string name="Big Hair Front">Big Hair Front</string> + <string name="Big Hair Top">Big Hair Top</string> + <string name="Body Fat">Body Fat</string> + <string name="Body Thickness">Body Thickness</string> + <string name="Breast Buoyancy">Breast Buoyancy</string> + <string name="Breast Cleavage">Breast Cleavage</string> + <string name="Breast Size">Breast Size</string> + <string name="Bridge Width">Bridge Width</string> + <string name="Brow Size">Brow Size</string> + <string name="Butt Size">Butt Size</string> + <string name="Cheek Bones">Cheek Bones</string> + <string name="Chest Size">Chest Size</string> + <string name="Chin Angle">Chin Angle</string> + <string name="Chin Cleft">Chin Cleft</string> + <string name="Chin Depth">Chin Depth</string> + <string name="Chin-Neck">Chin-Neck</string> + <string name="Collar Back">Collar Back</string> + <string name="Collar Front">Collar Front</string> + <string name="Crooked Nose">Crooked Nose</string> + <string name="Cuff Flare">Cuff Flare</string> + <string name="Ear Angle">Ear Angle</string> + <string name="Ear Size">Ear Size</string> + <string name="Ear Tips">Ear Tips</string> + <string name="Egg Head">Egg Head</string> + <string name="Eye Bags">Eye Bags</string> + <string name="Eye Color">Eye Color</string> + <string name="Eye Depth">Eye Depth</string> + <string name="Eye Lightness">Eye Lightness</string> + <string name="Eye Opening">Eye Opening</string> + <string name="Eye Pop">Eye Pop</string> + <string name="Eye Size">Eye Size</string> + <string name="Eye Spacing">Eye Spacing</string> + <string name="Eyeball Size">Eyeball Size</string> + <string name="Eyebrow Arc">Eyebrow Arc</string> + <string name="Eyebrow Height">Eyebrow Height</string> + <string name="Eyebrow Points">Eyebrow Points</string> + <string name="Eyelash Length">Eyelash Length</string> + <string name="Eyeliner">Eyeliner</string> + <string name="Eyeliner Color">Eyeliner Color</string> + <string name="Face Shear">Face Shear</string> + <string name="Facial Definitionr">Facial Definition</string> + <string name="Fat Head">Fat Head</string> + <string name="Fat Lower Lip">Fat Lower Lip</string> + <string name="Fat Torso">Fat Torso</string> + <string name="Fat Upper Lip">Fat Upper Lip</string> + <string name="Foot Size">Foot Size</string> + <string name="Freckles">Freckles</string> + <string name="Front Bangs Down">Front Bangs Down</string> + <string name="Front Bangs Up">Front Bangs Up</string> + <string name="Front Hair Down">Front Hair Down</string> + <string name="Front Hair Up">Front Hair Up</string> + <string name="Forehead Angle">Forehead Angle</string> + <string name="Full Hair Sides">Full Hair Sides</string> + <string name="Glove Fingers">Glove Fingers</string> + <string name="Glove Length">Glove Length</string> + <string name="Hair Thickess">Hair Thickess</string> + <string name="Hair Tilted Left">Hair Tilted Left</string> + <string name="Hair Tilted Right">Hair Tilted Right</string> + <string name="Hair Volume">Hair Volume</string> + <string name="Hand Size">Hand Size</string> + <string name="Head Length">Head Length</string> + <string name="Head Shape">Head Shape</string> + <string name="Head Size">Head Size</string> + <string name="Head Stretch">Head Stretch</string> + <string name="Heel Height">Heel Height</string> + <string name="Heel Shape">Heel Shape</string> + <string name="Height">Height</string> + <string name="Hip Width">Hip Width</string> + <string name="Hip Length">Hip Length</string> + <string name="Inner Eye Corner">Inner Eye Corner</string> + <string name="Jacket Length">Jacket Length</string> + <string name="Jacket Wrinkles">Jacket Wrinkles</string> + <string name="Jowls">Jowls</string> + <string name="Jaw Angle">Jaw Angle</string> + <string name="Jaw Jut">Jaw Jut</string> + <string name="Jaw Shape">Jaw Shape</string> + <string name="Knee Angle">Knee Angle</string> + <string name="Left Part">Left Part</string> + <string name="Leg Muscles">Leg Muscles</string> + <string name="Leg Length">Leg Length</string> + <string name="Lip Cleft">Lip Cleft</string> + <string name="Lip Cleft Depth">Lip Cleft Depth</string> + <string name="Lip Fullness">Lip Fullness</string> + <string name="Lip Pinkness">Lip Pinkness</string> + <string name="Lip Ratio">Lip Ratio</string> + <string name="Lip Thickness">Lip Thickness</string> + <string name="Lip Width">Lip Width</string> + <string name="Longcuffs">Longcuffs</string> + <string name="Love Handles">Love Handles</string> + <string name="Lower Bridge">Lower Bridge</string> + <string name="Lower Cheeks">Lower Cheeks</string> + <string name="Middle Part">Middle Part</string> + <string name="Mouth Corner">Mouth Corner</string> + <string name="Mouth Position">Mouth Position</string> + <string name="Nail Polish">Nail Polish</string> + <string name="Nail Polish Color">Nail Polish Color</string> + <string name="Neck Length">Neck Length</string> + <string name="Neck Thickness">Neck Thickness</string> + <string name="Nose Size">Nose Size</string> + <string name="Nose Thickness">Nose Thickness</string> + <string name="Nose Tip Angle">Nose Tip Angle</string> + <string name="Nose Tip Shape">Nose Tip Shape</string> + <string name="Nose Width">Nose Width</string> + <string name="Nostril Division">Nostril Division</string> + <string name="Nostril Width">Nostril Width</string> + <string name="Open Front">Open Front</string> + <string name="Outer Eye Corner">Outer Eye Corner</string> + <string name="Outer Shadow">Outer Shadow</string> + <string name="Out Shdw Opacity">Out Shdw Opacity</string> + <string name="Out Shdw Color">Out Shdw Color</string> + <string name="Package">Package</string> + <string name="Pants Crotch">Pants Crotch</string> + <string name="Pants Fit">Pants Fit</string> + <string name="Pants Length">Pants Length</string> + <string name="Pants Waist">Pants Waist</string> + <string name="Pants Wrinkles">Pants Wrinkles</string> + <string name="Part Bangs">Part Bangs</string> + <string name="Pectorals">Pectorals</string> + <string name="Platform Height">Platform Height</string> + <string name="Platform Width">Platform Width</string> + <string name="Pigment">Pigment</string> + <string name="Puffy Eyelids">Puffy Eyelids</string> + <string name="Rainbow Color">Rainbow Color</string> + <string name="Red Hair">Red Hair</string> + <string name="Right Part">Right Part</string> + <string name="Round Forehead">Round Forehead</string> + <string name="Rosy Complexion">Rosy Complexion</string> + <string name="Ruddiness">Ruddiness</string> + <string name="Rumpled Hair">Rumpled Hair</string> + <string name="Saddle Bags">Saddle Bags</string> + <string name="Scrawny Leg">Scrawny Leg</string> + <string name="Shear Back">Shear Back</string> + <string name="Shear Face">Shear Face</string> + <string name="Shear Front">Shear Front</string> + <string name="Shift Mouth">Shift Mouth</string> + <string name="Shirt Bottom">Shirt Bottom</string> + <string name="Shirt Fit">Shirt Fit</string> + <string name="Shirt Wrinkles">Shirt Wrinkles</string> + <string name="Shoe Height">Shoe Height</string> + <string name="Shoulders">Shoulders</string> + <string name="Side Bangs Down">Side Bangs Down</string> + <string name="Side Bangs Up">Side Bangs Up</string> + <string name="Sides Hair Down">Sides Hair Down</string> + <string name="Sides Hair Up">Sides Hair Up</string> + <string name="Skirt Fit">Skirt Fit</string> + <string name="Skirt Length">Skirt Length</string> + <string name="Slanted Forehead">Slanted Forehead</string> + <string name="Sleeve Length">Sleeve Length</string> + <string name="Sleeve Looseness">Sleeve Looseness</string> + <string name="Slit Back">Slit Back</string> + <string name="Slit Front">Slit Front</string> + <string name="Slit Left">Slit Left</string> + <string name="Slit Right">Slit Right</string> + <string name="Socks Length">Socks Length</string> + <string name="Spiked Hair">Spiked Hair</string> + <string name="Squash/Stretch Head">Squash/Stretch Head</string> + <string name="Swept Back Hair">Swept Back Hair</string> + <string name="Swept Forward Hair">Swept Forward Hair</string> + <string name="Taper Back">Taper Back</string> + <string name="Taper Front">Taper Front</string> + <string name="Toe Shape">Toe Shape</string> + <string name="Toe Thickness">Toe Thickness</string> + <string name="Toe Length">Toe Length</string> + <string name="Torso Length">Torso Length</string> + <string name="Torso Muscles">Torso Muscles</string> + <string name="Torso Scrawny">Torso Scrawny</string> + <string name="Upper Bridge">Upper Bridge</string> + <string name="Upper Cheeks">Upper Cheeks</string> + <string name="Upper Chin Cleft">Upper Chin Cleft</string> + <string name="Upper Eyelid Fold">Upper Eyelid Fold</string> + <string name="Waist Height">Waist Height</string> + <string name="White Hair">White Hair</string> + <string name="big belly skirt">big belly skirt</string> + <string name="bigbutt skirt">bigbutt skirt</string> + <string name="bustle skirt">bustle skirt</string> + <string name="legs skirt">legs skirt</string> + <string name="loose skirt">loose skirt</string> + <string name="poofy skirt">poofy skirt</string> + <string name="tight skirt">tight skirt</string> + <string name="wrinkles">wrinkles</string> </strings> diff --git a/indra/newview/skins/default/xui/en/widgets/check_box.xml b/indra/newview/skins/default/xui/en/widgets/check_box.xml index 97060fb161..bbb5e9b56a 100644 --- a/indra/newview/skins/default/xui/en/widgets/check_box.xml +++ b/indra/newview/skins/default/xui/en/widgets/check_box.xml @@ -13,5 +13,7 @@ image_unselected="Checkbox_Off" image_selected="Checkbox_On" image_disabled="Checkbox_Off_Disabled" - image_disabled_selected="Checkbox_On_Disabled" /> + image_disabled_selected="Checkbox_On_Disabled" + image_pressed="Checkbox_Press" + image_pressed_selected="Checkbox_On_Press"/> </check_box> diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml index eb9bb99b20..777651c452 100644 --- a/indra/newview/skins/default/xui/en/widgets/location_input.xml +++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml @@ -42,7 +42,7 @@ <combo_list bg_writeable_color="MenuDefaultBgColor"/> <combo_editor name="Combo Text Entry" text_pad_left="20" - select_on_focus="true" + select_on_focus="false" font="SansSerifSmall" bevel_style="none" border_style="line" diff --git a/indra/newview/skins/default/xui/en/widgets/radio_item.xml b/indra/newview/skins/default/xui/en/widgets/radio_item.xml index 281a55d5e2..dd848f3acd 100644 --- a/indra/newview/skins/default/xui/en/widgets/radio_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/radio_item.xml @@ -5,6 +5,8 @@ image_unselected="RadioButton_Off" image_selected="RadioButton_On" image_disabled="RadioButton_Disabled" - image_disabled_selected="RadioButton_On_Disabled"/> + image_disabled_selected="RadioButton_On_Disabled" + image_pressed="RadioButton_Press" + image_pressed_selected="RadioButton_On_Press"/> </radio_item> diff --git a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml index b33acf81cc..bc1ca339a2 100644 --- a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml +++ b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml @@ -3,5 +3,7 @@ thumb_outline_color="SliderThumbOutlineColor" thumb_center_color="SliderThumbCenterColor" thumb_image="SliderThumb_Off" + thumb_image_pressed="SliderThumb_Press" + thumb_image_disabled="SliderThumb_Disabled" track_image="SliderTrack_Horiz" track_highlight_image="SliderTrack_Horiz" /> |