diff options
Diffstat (limited to 'indra/newview/skins/default/xui/en')
125 files changed, 3473 insertions, 3465 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index 2580c06344..c7e9ec781d 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + open_positioning="centered" legacy_header_height="18" height="440" layout="topleft" @@ -195,34 +196,36 @@ Dummy Name replaced at run time top="5" width="435" word_wrap="true"> -3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion -APR Copyright (C) 2000-2004 The Apache Software Foundation -Collada DOM Copyright 2005 Sony Computer Entertainment Inc. -cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se) -DBus/dbus-glib Copyright (C) 2002, 2003 CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc. -expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd. -FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org). -GL Copyright (C) 1999-2004 Brian Paul. -GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University and David Luebke, Brenden Schubert, University of Virginia. -google-perftools Copyright (c) 2005, Google Inc. -Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited. -jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW) -jpeglib Copyright (C) 1991-1998, Thomas G. Lane. -ogg/vorbis Copyright (C) 2001, Xiphophorus -OpenSSL Copyright (C) 1998-2002 The OpenSSL Project. -PCRE Copyright (c) 1997-2008 University of Cambridge -SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga -SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) -xmlrpc-epi Copyright (C) 2000 Epinions, Inc. -zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler. -google-perftools Copyright (c) 2005, Google Inc. + 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion + APR Copyright (C) 2000-2004 The Apache Software Foundation + Collada DOM Copyright 2005 Sony Computer Entertainment Inc. + cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se) + DBus/dbus-glib Copyright (C) 2002, 2003 CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc. + expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd. + FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org). + GL Copyright (C) 1999-2004 Brian Paul. + GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University and David Luebke, Brenden Schubert, University of Virginia. + google-perftools Copyright (c) 2005, Google Inc. + Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited. + jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW) + jpeglib Copyright (C) 1991-1998, Thomas G. Lane. + ogg/vorbis Copyright (C) 2001, Xiphophorus + OpenSSL Copyright (C) 1998-2002 The OpenSSL Project. + PCRE Copyright (c) 1997-2008 University of Cambridge + SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga + SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) + xmlrpc-epi Copyright (C) 2000 Epinions, Inc. + zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler. + google-perftools Copyright (c) 2005, Google Inc. -Second Life Viewer uses Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (and its Licensors). All Rights Reserved. See www.havok.com for details. + Second Life Viewer uses Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (and its Licensors). All Rights Reserved. See www.havok.com for details. -All rights reserved. See licenses.txt for details. + This software contains source code provided by NVIDIA Corporation. -Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C) - </text_editor> + All rights reserved. See licenses.txt for details. + + Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C) + </text_editor> </panel> </tab_container> </floater> 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 e5dcc9bcb5..4772f744ea 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + open_positioning="cascading" can_tear_off="false" height="420" layout="topleft" @@ -486,7 +487,7 @@ name="DwellText" top_delta="0" width="186"> - 0 + Loading... </text> <button @@ -1207,7 +1208,7 @@ Only large parcels can be listed in search. </panel.string> <panel.string name="see_avs_text"> - See and chat with residents on this parcel + Avatars on other parcels can see </panel.string> <text type="string" @@ -1222,30 +1223,33 @@ Only large parcels can be listed in search. width="278"> Allow other Residents to: </text> - <check_box - height="16" - label="Edit Terrain" - layout="topleft" - left="14" - name="edit land check" - tool_tip="If checked, anyone can terraform your land. It is best to leave this unchecked, as you can always edit your own land." - top_pad="4" - width="147i" /> - <check_box + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="20" + name="allow_label0" + width="150"> + Fly: + </text> + + <check_box height="16" - label="Fly" + label="Everyone" layout="topleft" name="check fly" tool_tip="If checked, Residents can fly on your land. If unchecked, they can only fly into and over your land." - left_pad="4" - width="150" /> + left_pad="2" + width="130" /> <text type="string" length="1" follows="left|top" height="16" layout="topleft" - left="14" + left="20" name="allow_label2" width="150"> Build: @@ -1270,7 +1274,7 @@ Only large parcels can be listed in search. follows="left|top" height="16" layout="topleft" - left="14" + left="20" name="allow_label3" width="150"> Object Entry: @@ -1297,7 +1301,7 @@ Only large parcels can be listed in search. follows="left|top" height="16" layout="topleft" - left="14" + left="20" name="allow_label4" width="150"> Run Scripts: @@ -1318,49 +1322,47 @@ Only large parcels can be listed in search. name="check group scripts" top_delta="0" width="70" /> - <text - type="string" - text_color="white" - length="1" - follows="left|top" - height="16" - layout="topleft" - left="10" - name="land_options_label" - width="278"> - Land Options: - </text> - <check_box + <panel + bevel_style="none" + border="true" + top="146" + bottom="146" + follows="left|bottom|right" + left="20" + right="-20"/> + <check_box height="16" label="Safe (no damage)" layout="topleft" - left="14" + left="18" name="check safe" tool_tip="If checked, sets the land to Safe, disabling damage combat. If cleared, damage combat is enabled." - top_pad="5" + top="130" width="200" /> <check_box height="16" label="No Pushing" layout="topleft" - left_pad="5" + left_pad="35" name="PushRestrictCheck" tool_tip="Prevents scripts from pushing. Checking this option may be useful for preventing disruptive behavior on your land." - top_delta="0" + top="130" width="119" /> <check_box height="16" label="Show Place in Search (L$30/week)" layout="topleft" - left="14" + left="18" name="ShowDirectoryCheck" tool_tip="Let people see this parcel in search results" + top="150" width="430" /> <combo_box enabled="false" height="23" layout="topleft" - left="30" + left="20" + top="194" name="land category with adult" visible="false" width="140"> @@ -1425,7 +1427,8 @@ Only large parcels can be listed in search. enabled="false" height="23" layout="topleft" - left="30" + left="20" + top="194" name="land category" visible="false" width="140"> @@ -1486,11 +1489,11 @@ Only large parcels can be listed in search. height="16" label="Moderate Content" layout="topleft" - left="14" + left="18" name="MatureCheck" - top="177" + top="170" label_text.valign="center" - label_text.v_pad="-5" + label_text.v_pad="-1" tool_tip=" " width="200" /> <text @@ -1499,18 +1502,19 @@ Only large parcels can be listed in search. follows="left|top" height="16" layout="topleft" - left="10" + left="20" name="Snapshot:" text_color="white" - top="220" + top="225" width="200"> Snapshot: </text> <texture_picker follows="left|top" + top_pad="0" height="150" layout="topleft" - left="14" + left="20" name="snapshot_ctrl" fallback_image="default_land_picture.j2c" tool_tip="Click to choose a picture" @@ -1519,23 +1523,24 @@ Only large parcels can be listed in search. type="string" length="1" follows="left|top" - text_color="white" + text_color="LtGray" height="16" layout="topleft" - left="230" - top="174" + left="274" + top="166" name="allow_label5" width="278"> - Allow Residents on other parcels to: + and chat with avatars on this parcel </text> <check_box height="16" label="See Avatars" follows="top" layout="topleft" - left="230" + left="253" + top="150" name="SeeAvatarsCheck" - tool_tip="Allows residents on other parcels to see and chat with residents on this parcel, and you to see and chat with them." + tool_tip="Allows avatars on other parcels to see and chat with avatars on this parcel, and you to see and chat with them." width="120" /> <text type="string" @@ -1543,8 +1548,8 @@ Only large parcels can be listed in search. follows="left|top" height="16" layout="topleft" - left="230" - top="230" + left="255" + top="282" text_color="white" name="landing_point" word_wrap="true" @@ -1553,12 +1558,13 @@ Only large parcels can be listed in search. </text> <button follows="right|top" + top_pad="0" height="23" label="Set" label_selected="Set" layout="topleft" name="Set" - left="230" + left="255" tool_tip="Sets the landing point where visitors arrive. Sets to your avatar's location inside this parcel." width="50" /> <button @@ -1578,7 +1584,7 @@ Only large parcels can be listed in search. follows="left|top" height="16" layout="topleft" - left="230" + left="255" top_pad="10" name="Teleport Routing: " width="200"> @@ -1588,7 +1594,7 @@ Only large parcels can be listed in search. height="23" layout="topleft" name="landing type" - top_pad="3" + top_pad="0" tool_tip="Teleport Routing -- select how to handle teleports onto your land" width="120"> <combo_box.item diff --git a/indra/newview/skins/default/xui/en/floater_activeim.xml b/indra/newview/skins/default/xui/en/floater_activeim.xml index 96fe0aa70c..b79c5d9a19 100644 --- a/indra/newview/skins/default/xui/en/floater_activeim.xml +++ b/indra/newview/skins/default/xui/en/floater_activeim.xml @@ -4,11 +4,8 @@ name="floater_activeim" help_topic="floater_activeim" title="ACTIVE IM" - top="26" - left="0" height="22" width="320" - follows="right|bottom" background_visible="true" can_close="true" can_dock="true" diff --git a/indra/newview/skins/default/xui/en/floater_avatar.xml b/indra/newview/skins/default/xui/en/floater_avatar.xml new file mode 100644 index 0000000000..82c3403008 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_avatar.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + open_positioning="cascading" + ignore_ui_scale="false" + legacy_header_height="225" + can_minimize="true" + can_close="true" + can_resize="true" + min_height="230" + min_width="450" + height="230" + layout="topleft" + name="Avatar" + single_instance="true" + help_topic="avatar" + save_rect="true" + save_visibility="true" + title="CHOOSE AN AVATAR" + width="700"> + <web_browser + top="25" + height="200" + width="700" + follows="all" + name="avatar_picker_contents" + trusted_content="true"/> +</floater> 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 a11946d352..cbbbeb6094 100644 --- a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml +++ b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + open_positioning="cascading" legacy_header_height="18" can_resize="true" height="350" diff --git a/indra/newview/skins/default/xui/en/floater_build_options.xml b/indra/newview/skins/default/xui/en/floater_build_options.xml index afb7917043..35918e9705 100644 --- a/indra/newview/skins/default/xui/en/floater_build_options.xml +++ b/indra/newview/skins/default/xui/en/floater_build_options.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater legacy_header_height="18" - follows="right" height="198" layout="topleft" name="build options floater" diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency.xml b/indra/newview/skins/default/xui/en/floater_buy_currency.xml index 49ca6cc8ba..6afa24d04a 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_currency.xml @@ -224,7 +224,7 @@ width="300" height="30" name="currency_links"> - [http://www.secondlife.com/my/account/payment_method_management.php payment method] | [http://www.secondlife.com/my/account/currency.php currency] | [http://www.secondlife.com/my/account/exchange_rates.php exchange rate] + [http://www.secondlife.com/my/account/payment_method_management.php payment method] | [http://www.secondlife.com/my/account/currency.php currency] </text> <text type="string" diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml index b9c415633f..0637eedfb2 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml @@ -23,6 +23,5 @@ right="-1" top="1" bottom="-1" - ignore_ui_scale="false" name="browser"/> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml index da2be18db6..4673c6def5 100644 --- a/indra/newview/skins/default/xui/en/floater_camera.xml +++ b/indra/newview/skins/default/xui/en/floater_camera.xml @@ -1,18 +1,20 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + open_positioning="specified" + specified_left="458" + specified_bottom="80" legacy_header_height="18" - can_dock="true" can_minimize="true" - can_close="false" - follows="bottom" + can_close="true" height="164" layout="topleft" name="camera_floater" help_topic="camera_floater" - save_rect="true" save_visibility="true" - save_dock_state="true" single_instance="true" + title="CAMERA CONTROLS" + chrome="true" + save_rect="true" width="228"> <floater.string name="rotate_tooltip"> @@ -27,18 +29,6 @@ Move Camera Up and Down, Left and Right </floater.string> <floater.string - name="camera_modes_title"> - Camera modes - </floater.string> - <floater.string - name="pan_mode_title"> - Orbit Zoom Pan - </floater.string> - <floater.string - name="presets_mode_title"> - Preset Views - </floater.string> - <floater.string name="free_mode_title"> View Object </floater.string> @@ -164,14 +154,10 @@ <joystick_rotate follows="top|left" height="78" - image_selected="Cam_Rotate_In" - image_unselected="Cam_Rotate_Out" layout="topleft" left="7" - mouse_opaque="false" name="cam_rotate_stick" quadrant="left" - scale_image="false" sound_flags="3" visible="true" tool_tip="Orbit camera around focus" diff --git a/indra/newview/skins/default/xui/en/floater_chat_bar.xml b/indra/newview/skins/default/xui/en/floater_chat_bar.xml new file mode 100644 index 0000000000..8d0cecdac3 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_chat_bar.xml @@ -0,0 +1,82 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + open_positioning="specified" + specified_left="10" + specified_bottom="10" + height="60" + layout="topleft" + legacy_header_height="25" + single_instance="true" + title="NEARBY CHAT" + save_rect="true" + can_close="true" + can_minimize="true" + help_topic="chat_bar" + min_height="60" + min_width="150" + can_resize="true" + default_tab_group="1" + name="chat_bar" + width="300"> + <panel + top="20" + class="panel_nearby_chat" + follow="all" + width="300" + height="0" + visible="false" + filename="panel_nearby_chat.xml" + name="nearby_chat" /> + <panel width="300" + height="31" + left="0" + bottom="-1" + follows="left|right|bottom" + tab_group="1"> + <line_editor + border_style="line" + border_thickness="1" + follows="left|right" + height="23" + label="Click here to chat." + layout="topleft" + left_delta="7" + left="0" + max_length_bytes="1023" + name="chat_box" + text_pad_left="5" + text_pad_right="25" + tool_tip="Press Enter to say, Ctrl+Enter to shout" + top="2" + width="255" /> + <output_monitor + auto_update="true" + follows="right" + draw_border="false" + height="16" + layout="topleft" + left_pad="-24" + mouse_opaque="true" + name="chat_zone_indicator" + top="6" + visible="true" + width="20" /> + <button + follows="right" + is_toggle="true" + width="20" + top="2" + layout="topleft" + left_pad="12" + image_disabled="ComboButton_UpOff" + image_unselected="ComboButton_UpOff" + image_selected="ComboButton_On" + image_pressed="ComboButton_UpSelected" + image_pressed_selected="ComboButton_Selected" + height="23" + chrome="true" + name="show_nearby_chat" + tool_tip="Shows/hides nearby chat log"> + </button> + </panel> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_color_picker.xml b/indra/newview/skins/default/xui/en/floater_color_picker.xml index 421f3a72c6..e06d10606a 100644 --- a/indra/newview/skins/default/xui/en/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/en/floater_color_picker.xml @@ -2,7 +2,6 @@ <floater legacy_header_height="18" can_minimize="false" - follows="left|top" height="380" layout="topleft" name="ColorPicker" diff --git a/indra/newview/skins/default/xui/en/floater_critical.xml b/indra/newview/skins/default/xui/en/floater_critical.xml index 05c958e051..13b15bf724 100644 --- a/indra/newview/skins/default/xui/en/floater_critical.xml +++ b/indra/newview/skins/default/xui/en/floater_critical.xml @@ -6,7 +6,7 @@ height="500" layout="topleft" name="modal container" - open_centered="true" + open_positioning="centered" width="600"> <button height="20" diff --git a/indra/newview/skins/default/xui/en/floater_destinations.xml b/indra/newview/skins/default/xui/en/floater_destinations.xml new file mode 100644 index 0000000000..373114a1eb --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_destinations.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + open_positioning="cascading" + ignore_ui_scale="false" + legacy_header_height="225" + can_minimize="true" + can_close="true" + user_resize="true" + can_resize="true" + min_height="230" + min_width="350" + height="230" + layout="topleft" + name="Destinations" + single_instance="true" + help_topic="destinations" + save_rect="true" + save_visibility="true" + title="DESTINATIONS" + width="840"> + <web_browser + top="25" + height="200" + width="840" + follows="all" + name="destination_guide_contents" + trusted_content="true"/> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_event.xml b/indra/newview/skins/default/xui/en/floater_event.xml index 7ed020f832..cf61b7d24d 100644 --- a/indra/newview/skins/default/xui/en/floater_event.xml +++ b/indra/newview/skins/default/xui/en/floater_event.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater - follows="all" height="400" can_resize="true" help_topic="event_details" diff --git a/indra/newview/skins/default/xui/en/floater_gesture.xml b/indra/newview/skins/default/xui/en/floater_gesture.xml index 9f5e6828d2..b96a94a849 100644 --- a/indra/newview/skins/default/xui/en/floater_gesture.xml +++ b/indra/newview/skins/default/xui/en/floater_gesture.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + open_positioning="cascading" + save_rect="true" legacy_header_height="18" can_resize="true" height="465" @@ -7,7 +9,6 @@ help_topic="gestures" title="GESTURES" background_visible="true" - follows="all" label="Places" layout="topleft" min_height="350" diff --git a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml index 05f4c52b95..66bb9d3cea 100644 --- a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml @@ -35,7 +35,7 @@ height="12" layout="topleft" left="10" - name="Antialiasing:" + name="antialiasing label" top_pad="7" width="188"> Antialiasing: diff --git a/indra/newview/skins/default/xui/en/floater_help_browser.xml b/indra/newview/skins/default/xui/en/floater_help_browser.xml index de6d586f72..d101bca694 100644 --- a/indra/newview/skins/default/xui/en/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/en/floater_help_browser.xml @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + open_positioning="cascading" legacy_header_height="18" can_resize="true" - left="10000" - bottom="10000" height="600" layout="topleft" min_height="150" diff --git a/indra/newview/skins/default/xui/en/floater_how_to.xml b/indra/newview/skins/default/xui/en/floater_how_to.xml new file mode 100644 index 0000000000..8c0077a8cc --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_how_to.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + can_resize="true" + can_minimize="true" + height="775" + layout="topleft" + min_height="360" + left="10000" + top="10" + min_width="335" + name="floater_how_to" + help_topic="how_to" + single_instance="true" + save_rect="true" + title="HOW TO" + width="780" + filename="floater_web_content.xml"/>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/floater_hud.xml b/indra/newview/skins/default/xui/en/floater_hud.xml index 99a6a95828..e2d860881a 100644 --- a/indra/newview/skins/default/xui/en/floater_hud.xml +++ b/indra/newview/skins/default/xui/en/floater_hud.xml @@ -8,6 +8,7 @@ help_topic="floater_hud" save_rect="true" save_visibility="true" + chrome="true" title="TUTORIAL" width="362"> <web_browser diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml index a371e98322..a2739a8339 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -3,12 +3,10 @@ legacy_header_height="18" background_visible="true" default_tab_group="1" - follows="all" - height="350" + height="355" + help_topic="floater_im_box" layout="topleft" - left="0" name="panel_im" - top="0" can_dock="false" can_minimize="true" can_close="true" diff --git a/indra/newview/skins/default/xui/en/floater_inventory.xml b/indra/newview/skins/default/xui/en/floater_inventory.xml deleted file mode 100644 index ba2e0d3277..0000000000 --- a/indra/newview/skins/default/xui/en/floater_inventory.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater - legacy_header_height="18" - auto_tile="true" - can_resize="true" - height="563" - layout="topleft" - min_height="150" - min_width="240" - name="Inventory" - help_topic="inventory" - save_rect="true" - save_visibility="true" - single_instance="false" - title="MY INVENTORY" - width="467"> - <panel - bottom="560" - class="panel_main_inventory" - filename="panel_main_inventory.xml" - follows="all" - layout="topleft" - left="0" - label="Inventory Panel" - name="Inventory Panel" - top="15" - width="467" /> -</floater> 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 0cf07926c2..adef066aef 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,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater legacy_header_height="18" - auto_tile="true" height="340" layout="topleft" name="item properties" diff --git a/indra/newview/skins/default/xui/en/floater_land_holdings.xml b/indra/newview/skins/default/xui/en/floater_land_holdings.xml index 0b9ae3c9f3..3737294ebe 100644 --- a/indra/newview/skins/default/xui/en/floater_land_holdings.xml +++ b/indra/newview/skins/default/xui/en/floater_land_holdings.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + open_positioning="centered" legacy_header_height="18" height="430" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml index 1f192f9b28..5cd7cd196d 100644 --- a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml +++ b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml @@ -4,7 +4,6 @@ bevel_style="none" border_style="line" can_resize="true" - follows="left|top" height="580" layout="topleft" min_height="271" diff --git a/indra/newview/skins/default/xui/en/floater_lsl_guide.xml b/indra/newview/skins/default/xui/en/floater_lsl_guide.xml index c9d87f158f..e9676777f4 100644 --- a/indra/newview/skins/default/xui/en/floater_lsl_guide.xml +++ b/indra/newview/skins/default/xui/en/floater_lsl_guide.xml @@ -2,7 +2,6 @@ <floater legacy_header_height="18" can_resize="true" - follows="left|top" height="400" layout="topleft" min_height="271" diff --git a/indra/newview/skins/default/xui/en/floater_map.xml b/indra/newview/skins/default/xui/en/floater_map.xml index ae99fa8dd5..3eeebcf120 100644 --- a/indra/newview/skins/default/xui/en/floater_map.xml +++ b/indra/newview/skins/default/xui/en/floater_map.xml @@ -1,22 +1,18 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater - bg_alpha_image_overlay="DkGray_66" - legacy_header_height="0" + open_positioning="cascading" can_minimize="true" can_resize="true" - follows="top|right" - height="174" + chrome="true" + height="200" layout="topleft" min_height="128" min_width="128" name="Map" - title="" + title="MINI-MAP" help_topic="map" save_rect="true" save_visibility="true" - single_instance="true" - left="0" - top="0" width="200"> <floater.string name="ToolTipMsg"> @@ -27,17 +23,16 @@ [REGION](Double-click to teleport, shift-drag to pan) </floater.string> <floater.string name="mini_map_caption"> - MINIMAP + Mini-map </floater.string> <net_map - bg_color="NetMapBackgroundColor" follows="top|left|bottom|right" layout="topleft" left="0" mouse_opaque="false" name="Net Map" width="200" - height="218" + height="200" top="0"/> <text type="string" @@ -49,7 +44,7 @@ name="floater_map_north" right="10" text_color="1 1 1 0.7" - top="209"> + top="189"> N </text> <text @@ -62,7 +57,7 @@ name="floater_map_east" right="10" text_color="1 1 1 0.7" - top="209"> + top="189"> E </text> <text @@ -75,7 +70,7 @@ name="floater_map_west" right="11" text_color="1 1 1 0.7" - top="195"> + top="175"> W </text> <text @@ -88,7 +83,7 @@ name="floater_map_south" right="10" text_color="1 1 1 0.7" - top="209"> + top="189"> S </text> <text @@ -101,7 +96,7 @@ name="floater_map_southeast" right="20" text_color="1 1 1 0.7" - top="209"> + top="189"> SE </text> <text @@ -114,7 +109,7 @@ name="floater_map_northeast" right="20" text_color="1 1 1 0.7" - top="209"> + top="189"> NE </text> <text @@ -127,7 +122,7 @@ name="floater_map_southwest" right="20" text_color="1 1 1 0.7" - top="209"> + top="189"> SW </text> <text @@ -140,7 +135,7 @@ name="floater_map_northwest" right="20" text_color="1 1 1 0.7" - top="209"> + top="189"> NW </text> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_media_browser.xml b/indra/newview/skins/default/xui/en/floater_media_browser.xml index 5a1f920398..c3324a6aa4 100644 --- a/indra/newview/skins/default/xui/en/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/en/floater_media_browser.xml @@ -9,7 +9,6 @@ name="floater_about" help_topic="floater_about" save_rect="true" - auto_tile="true" title="MEDIA BROWSER" width="820"> <floater.string diff --git a/indra/newview/skins/default/xui/en/floater_media_settings.xml b/indra/newview/skins/default/xui/en/floater_media_settings.xml index 681731b0da..0e03c0ab6d 100644 --- a/indra/newview/skins/default/xui/en/floater_media_settings.xml +++ b/indra/newview/skins/default/xui/en/floater_media_settings.xml @@ -10,7 +10,6 @@ enabled="true" width="365" height="535" - left="330" min_height="535" min_width="365" mouse_opaque="true" diff --git a/indra/newview/skins/default/xui/en/floater_mem_leaking.xml b/indra/newview/skins/default/xui/en/floater_mem_leaking.xml index 28a29c42aa..fb7d09a21e 100644 --- a/indra/newview/skins/default/xui/en/floater_mem_leaking.xml +++ b/indra/newview/skins/default/xui/en/floater_mem_leaking.xml @@ -2,7 +2,6 @@ <floater legacy_header_height="18" can_minimize="false" - follows="left|top" height="175" layout="topleft" name="MemLeak" diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml index 2eea286c8b..eebc5ddc72 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater can_close="true" can_drag_on_left="false" can_minimize="false" can_resize="false" height="480" min_height="480" min_width="940" - name="Model Preview" title="Upload Model" width="940" + name="Model Preview" title="UPLOAD MODEL" width="940" help_topic="upload_model" > <string name="status_idle"></string> <string name="status_parse_error">Error: Dae parsing issue - see log for details.</string> + <string name="status_material_mismatch">Error: Material of model is not a subset of reference model.</string> <string name="status_reading_file">Loading...</string> <string name="status_generating_meshes">Generating Meshes...</string> <string name="status_vertex_number_overflow">Error: Vertex number is more than 65534, aborted!</string> @@ -789,7 +790,7 @@ <check_box name="physics_use_hull" follows="left|top" width="130" left_pad="5" height="20" label="Use Convex Hull"/> --> </panel> - <!-- ==== STEP 2: Analyse ==== --> + <!-- ==== STEP 2: Analyze ==== --> <view_border bevel_style="none" follows="top|left" @@ -818,7 +819,7 @@ name="method_label" text_color="White" top_pad="0"> - Step 2: Analyse + Step 2: Analyze </text> <text follows="top|left" diff --git a/indra/newview/skins/default/xui/en/floater_model_wizard.xml b/indra/newview/skins/default/xui/en/floater_model_wizard.xml index b5a5ff5342..9c0af7d9ba 100644 --- a/indra/newview/skins/default/xui/en/floater_model_wizard.xml +++ b/indra/newview/skins/default/xui/en/floater_model_wizard.xml @@ -199,7 +199,7 @@ height="10" layout="topleft" left="10" - name="Cache location" + name="Model types" width="320"> Second Life supports COLLADA (.dae) files </text> diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml index 6f29255a6b..065dab0413 100644 --- a/indra/newview/skins/default/xui/en/floater_moveview.xml +++ b/indra/newview/skins/default/xui/en/floater_moveview.xml @@ -1,17 +1,21 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + open_positioning="specified" + specified_left="320" + specified_bottom="80" legacy_header_height="18" - can_dock="true" + can_dock="false" can_minimize="true" - can_close="false" - follows="bottom" + can_close="true" height="110" layout="topleft" name="move_floater" help_topic="move_floater" save_rect="true" save_visibility="true" - save_dock_state="true" + single_instance="true" + chrome="true" + title="WALK / RUN / FLY" width="133"> <string name="walk_forward_tooltip"> diff --git a/indra/newview/skins/default/xui/en/floater_my_appearance.xml b/indra/newview/skins/default/xui/en/floater_my_appearance.xml new file mode 100644 index 0000000000..1c4b25a7b0 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_my_appearance.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> + +<floater + open_positioning="cascading" + legacy_header_height="18" + can_resize="true" + height="588" + layout="topleft" + name="floater_my_appearance" + help_topic="appearance" + save_rect="true" + single_instance="true" + reuse_instance="true" + title="APPEARANCE" + min_height="440" + min_width="333" + width="333"> + <panel + top="18" + class="sidepanel_appearance" + name="main_panel" + filename="sidepanel_appearance.xml" + label="Edit Appearance" + font="SansSerifBold"/> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_my_inventory.xml b/indra/newview/skins/default/xui/en/floater_my_inventory.xml new file mode 100644 index 0000000000..cd0b59dc51 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_my_inventory.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<floater + open_positioning="cascading" + can_close="true" + can_resize="true" + height="570" + help_topic="sidebar_inventory" + min_width="333" + min_height="440" + name="floater_my_inventory" + save_rect="true" + save_visibility="true" + reuse_instance="true" + title="INVENTORY" + width="333" > + <panel + class="sidepanel_inventory" + name="main_panel" + filename="sidepanel_inventory.xml" + follows="all" + top="0"/> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_my_web_profile.xml b/indra/newview/skins/default/xui/en/floater_my_web_profile.xml new file mode 100644 index 0000000000..df46fc198f --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_my_web_profile.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater name="floater_my_web_profile" + help_topic="web_profile" + width="780" + height="775" + save_rect="true" + single_instance="true" + reuse_instance="false" + filename="floater_web_content.xml"/>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml index 068737494f..bbe280582b 100644 --- a/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml +++ b/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml @@ -4,7 +4,7 @@ can_minimize="false" height="100" layout="topleft" - title="Save Outfit" + title="SAVE OUTFIT" name="modal container" width="240"> <button diff --git a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml index 9db6568ee3..ffbb6aa28b 100644 --- a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml @@ -8,6 +8,7 @@ layout="topleft" name="outgoing call" help_topic="outgoing_call" + save_dock_state="true" title="CALLING" width="410"> <floater.string diff --git a/indra/newview/skins/default/xui/en/floater_people.xml b/indra/newview/skins/default/xui/en/floater_people.xml new file mode 100644 index 0000000000..d6d8431150 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_people.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> + +<floater + open_positioning="cascading" + can_close="true" + can_resize="true" + height="570" + help_topic="sidebar_people" + min_height="440" + min_width="333" + layout="topleft" + name="floater_people" + save_rect="true" + single_instance="true" + reuse_instance="true" + title="PEOPLE" + width="333"> + <panel_container + default_panel_name="panel_people" + follows="all" + height="570" + name="main_panel" + width="333"> + <panel + class="panel_people" + name="panel_people" + filename="panel_people.xml"/> + <panel + class="panel_group_info_sidetray" + name="panel_group_info_sidetray" + filename="panel_group_info_sidetray.xml" + label="Group Profile" + font="SansSerifBold"/> + <panel + class="panel_block_list_sidetray" + name="panel_block_list_sidetray" + filename="panel_block_list_sidetray.xml" + label="Blocked Residents & Objects" + font="SansSerifBold"/> + </panel_container> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_picks.xml b/indra/newview/skins/default/xui/en/floater_picks.xml new file mode 100644 index 0000000000..7882116662 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_picks.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<floater + open_positioning="cascading" + can_close="true" + can_resize="true" + height="572" + help_topic="sidebar_me" + min_width="333" + min_height="440" + name="floater_picks" + save_rect="true" + save_visibility="true" + reuse_instance="true" + title="Picks" + width="333" > + <panel + class="panel_me" + name="main_panel" + filename="panel_me.xml" + follows="all"/> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_places.xml b/indra/newview/skins/default/xui/en/floater_places.xml new file mode 100644 index 0000000000..ccceac0a7b --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_places.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> + +<floater + open_positioning="cascading" + legacy_header_height="18" + can_resize="true" + height="588" + layout="topleft" + name="floater_places" + help_topic="floater_places" + save_rect="true" + reuse_instance="true" + title="PLACES" + min_height="440" + min_width="333" + width="333"> + <panel + top="18" + class="panel_places" + name="main_panel" + filename="panel_places.xml" + label="Places" + font="SansSerifBold"/> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml index dcfa8bc060..402868bb97 100644 --- a/indra/newview/skins/default/xui/en/floater_preferences.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences.xml @@ -1,12 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater legacy_header_height="18" - open_centered="true" + open_positioning="centered" default_tab_group="1" height="460" layout="topleft" name="Preferences" help_topic="preferences" + save_rect="true" single_instance="true" title="PREFERENCES" width="658"> diff --git a/indra/newview/skins/default/xui/en/floater_preview_animation.xml b/indra/newview/skins/default/xui/en/floater_preview_animation.xml index 65efc46c71..8427c7b06f 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_animation.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater legacy_header_height="18" - auto_tile="true" height="85" layout="topleft" name="preview_anim" diff --git a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml index 478ae5f53f..8baa0a56f7 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater legacy_header_height="18" - auto_tile="true" height="460" layout="topleft" name="gesture_preview" @@ -362,4 +361,4 @@ name="save_btn" top_delta="0" width="80" /> -</floater>
\ No newline at end of file +</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 8c9e1d52b3..be3b2d179d 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml @@ -1,10 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater legacy_header_height="18" - auto_tile="true" can_resize="true" default_tab_group="1" - follows="left|top" height="361" layout="topleft" min_height="243" diff --git a/indra/newview/skins/default/xui/en/floater_preview_sound.xml b/indra/newview/skins/default/xui/en/floater_preview_sound.xml index 62ef4c3097..83a1f5a96f 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_sound.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_sound.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater legacy_header_height="18" - auto_tile="true" height="85" layout="topleft" name="preview_sound" diff --git a/indra/newview/skins/default/xui/en/floater_preview_texture.xml b/indra/newview/skins/default/xui/en/floater_preview_texture.xml index a79d2f63cb..137e278ddc 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_texture.xml @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater legacy_header_height="18" - auto_tile="true" can_resize="true" - follows="left|top" height="350" layout="topleft" min_height="200" diff --git a/indra/newview/skins/default/xui/en/floater_script.xml b/indra/newview/skins/default/xui/en/floater_script.xml index 12ade86b5f..bd4edb81c8 100644 --- a/indra/newview/skins/default/xui/en/floater_script.xml +++ b/indra/newview/skins/default/xui/en/floater_script.xml @@ -2,12 +2,9 @@ <floater legacy_header_height="18" background_visible="true" - follows="left|top|right|bottom" height="250" layout="topleft" - left="0" name="script_floater" - top="0" can_dock="true" can_minimize="true" visible="false" diff --git a/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml index ce96ea232e..b5dd2f97b9 100644 --- a/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml +++ b/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml @@ -2,7 +2,6 @@ <floater legacy_header_height="18" can_resize="true" - follows="left|top|right|bottom" height="200" layout="topleft" name="script" diff --git a/indra/newview/skins/default/xui/en/floater_script_preview.xml b/indra/newview/skins/default/xui/en/floater_script_preview.xml index 8c03b56040..91a9e67e4c 100644 --- a/indra/newview/skins/default/xui/en/floater_script_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_script_preview.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater legacy_header_height="18" - auto_tile="true" can_resize="true" height="570" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/floater_script_queue.xml b/indra/newview/skins/default/xui/en/floater_script_queue.xml index 60a26fcf1d..f4aca7bb3d 100644 --- a/indra/newview/skins/default/xui/en/floater_script_queue.xml +++ b/indra/newview/skins/default/xui/en/floater_script_queue.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater legacy_header_height="18" - auto_tile="true" can_resize="true" height="400" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml index eaf575fc08..dd818e2e06 100644 --- a/indra/newview/skins/default/xui/en/floater_search.xml +++ b/indra/newview/skins/default/xui/en/floater_search.xml @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + open_positioning="cascading" legacy_header_height="18" - can_resize="true" + can_resize="true" height="775" - layout="topleft" - min_height="400" + layout="topleft" + min_height="400" min_width="500" - name="floater_web_content" - help_topic="floater_web_content" - save_rect="true" - auto_tile="true" - save_visibility="true" + name="floater_search" + help_topic="floater_search" + save_rect="true" + save_visibility="true" title="" initial_mime_type="text/html" width="780" - tab_stop="true" + tab_stop="true" filename="floater_web_content.xml"/> diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml index 89a0c4c287..0c38283d59 100644 --- a/indra/newview/skins/default/xui/en/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml @@ -1,403 +1,373 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + open_positioning="cascading" legacy_header_height="18" - can_minimize="false" + can_minimize="true" can_close="true" - follows="left|top" - height="520" + height="500" layout="topleft" name="Snapshot" help_topic="snapshot" save_rect="true" - save_visibility="true" + save_visibility="false" title="SNAPSHOT PREVIEW" - width="245"> + width="470"> <floater.string name="unknown"> unknown </floater.string> - <radio_group - height="70" - label="Snapshot type" - layout="topleft" - left="10" - name="snapshot_type_radio" - top="20" - width="205"> -<!-- - <radio_item - height="16" - label="Share to Web" - layout="topleft" - name="share_to_web" - top_pad="0" /> ---> - <radio_item - height="16" - label="Email" - layout="topleft" - name="postcard" - top_pad="2" /> - <radio_item - height="16" - label="My inventory (L$[AMOUNT])" - layout="topleft" - name="texture" - top_pad="2" /> - <radio_item - height="16" - label="Save to my computer" - layout="topleft" - name="local" - top_pad="2" /> - </radio_group> - <ui_ctrl - height="90" - width="125" - layout="topleft" - name="thumbnail_placeholder" - top_pad="6" - follows="left|top" - left="10" - /> - <text - type="string" - font="SansSerifSmall" - length="1" - follows="left|top" - height="14" - layout="topleft" - right="-5" - left_delta="0" - halign="right" - name="file_size_label" - top_pad="8" - width="195"> - [SIZE] KB - </text> - <button - follows="left|top" - height="22" - image_overlay="Refresh_Off" - layout="topleft" - left="10" - name="new_snapshot_btn" - width="23" /> - <button - follows="left|top" - height="23" - label="Send" - layout="topleft" - left_pad="5" - right="-5" - name="send_btn" - width="100" /> + <string + name="postcard_progress_str"> + Sending Email + </string> + <string + name="profile_progress_str"> + Posting + </string> + <string + name="inventory_progress_str"> + Saving to Inventory + </string> + <string + name="local_progress_str"> + Saving to Computer + </string> + <string + name="profile_succeeded_str"> + Image uploaded + </string> + <string + name="postcard_succeeded_str"> + Email Sent! + </string> + <string + name="inventory_succeeded_str"> + Saved to Inventory! + </string> + <string + name="local_succeeded_str"> + Saved to Computer! + </string> + <string + name="profile_failed_str"> + Failed to upload image to your Profile Feed. + </string> + <string + name="postcard_failed_str"> + Failed to send email. + </string> + <string + name="inventory_failed_str"> + Failed to save to inventory. + </string> + <string + name="local_failed_str"> + Failed to save to computer. + </string> <button follows="left|top" height="23" - label="Save (L$[AMOUNT])" + image_overlay="TabIcon_Close_Off" layout="topleft" - right="-5" - name="upload_btn" - top_delta="0" - width="110" /> - <flyout_button - follows="left|top" - height="23" - label="Save" - layout="topleft" - right="-5" - name="save_btn" - tool_tip="Save image to a file" - top_delta="0" - width="100"> - <flyout_button.item - label="Save" - name="save_item" - value="save" /> - <flyout_button.item - label="Save As..." - name="saveas_item" - value="save as" /> - </flyout_button> - <button - follows="left|top" - height="23" - label="More" - layout="topleft" - left="10" - name="more_btn" + left="236" + name="advanced_options_btn" tool_tip="Advanced options" - width="80" /> - <button - follows="left|top" - height="23" - label="Less" - layout="topleft" - left_delta="0" - name="less_btn" - tool_tip="Advanced options" - top_delta="0" - width="80" /> - <button - follows="left|top" - height="23" - label="Cancel" - layout="topleft" - right="-5" - left_pad="5" - name="discard_btn" - width="110" /> - <text - type="string" - length="1" - follows="top|left" - height="12" - layout="topleft" - left="10" - name="type_label2" - top_pad="5" - width="127"> - Size - </text> - <text - type="string" - length="1" - follows="top|left" - height="12" - layout="topleft" - left_pad="5" - name="format_label" - top_delta="0" - width="70"> - Format - </text> - <combo_box - height="23" - label="Resolution" - layout="topleft" - left="10" - name="postcard_size_combo" - width="120"> - <combo_box.item - label="Current Window" - name="CurrentWindow" - value="[i0,i0]" /> - <combo_box.item - label="640x480" - name="640x480" - value="[i640,i480]" /> - <combo_box.item - label="800x600" - name="800x600" - value="[i800,i600]" /> - <combo_box.item - label="1024x768" - name="1024x768" - value="[i1024,i768]" /> - <combo_box.item - label="Custom" - name="Custom" - value="[i-1,i-1]" /> - </combo_box> - <combo_box - height="23" - label="Resolution" - layout="topleft" - left_delta="0" - name="texture_size_combo" - top_delta="0" - width="127"> - <combo_box.item - label="Current Window" - name="CurrentWindow" - value="[i0,i0]" /> - <combo_box.item - label="Small (128x128)" - name="Small(128x128)" - value="[i128,i128]" /> - <combo_box.item - label="Medium (256x256)" - name="Medium(256x256)" - value="[i256,i256]" /> - <combo_box.item - label="Large (512x512)" - name="Large(512x512)" - value="[i512,i512]" /> - <combo_box.item - label="Custom" - name="Custom" - value="[i-1,i-1]" /> - </combo_box> - <combo_box - height="23" - label="Resolution" - layout="topleft" - left_delta="0" - name="local_size_combo" - top_delta="0" - width="127"> - <combo_box.item - label="Current Window" - name="CurrentWindow" - value="[i0,i0]" /> - <combo_box.item - label="320x240" - name="320x240" - value="[i320,i240]" /> - <combo_box.item - label="640x480" - name="640x480" - value="[i640,i480]" /> - <combo_box.item - label="800x600" - name="800x600" - value="[i800,i600]" /> - <combo_box.item - label="1024x768" - name="1024x768" - value="[i1024,i768]" /> - <combo_box.item - label="1280x1024" - name="1280x1024" - value="[i1280,i1024]" /> - <combo_box.item - label="1600x1200" - name="1600x1200" - value="[i1600,i1200]" /> - <combo_box.item - label="Custom" - name="Custom" - value="[i-1,i-1]" /> - </combo_box> - <combo_box - height="23" - label="Format" - layout="topleft" - left_pad="5" - name="local_format_combo" - width="70"> - <combo_box.item - label="PNG" - name="PNG" /> - <combo_box.item - label="JPEG" - name="JPEG" /> - <combo_box.item - label="BMP" - name="BMP" /> - </combo_box> - <spinner - allow_text_entry="false" - decimal_digits="0" - follows="left|top" - height="20" - increment="32" - label="Width" - label_width="40" - layout="topleft" - left="10" - max_val="6016" - min_val="32" - name="snapshot_width" - top_pad="10" - width="95" /> - <spinner - allow_text_entry="false" - decimal_digits="0" - follows="left|top" - height="20" - increment="32" - label="Height" - label_width="40" - layout="topleft" - left_pad="5" - max_val="6016" - min_val="32" - name="snapshot_height" - top_delta="0" - width="95" /> - <check_box - bottom_delta="20" - label="Constrain proportions" - layout="topleft" - left="10" - name="keep_aspect_check" /> - <slider - decimal_digits="0" - follows="left|top" - height="15" - increment="1" - initial_value="75" - label="Image quality" - label_width="124" - layout="topleft" - left_delta="0" - max_val="100" - name="image_quality_slider" - top_pad="5" - width="228" /> - <text - type="string" - length="1" + top="25" + width="23" /> + <ui_ctrl + height="160" + width="250" + layout="topleft" + name="thumbnail_placeholder" + top="50" + follows="left|top" + left="10"> + <panel + background_visible="true" + bg_alpha_color="0.9 1 0.9 1" + follows="left|top" + font="SansSerifLarge" + halign="center" + height="20" + layout="topleft" + left="0" + length="1" + name="succeeded_panel" + right="-1" + top="0" + type="string" + visible="false"> + <text + follows="all" + font="SansSerif" + halign="center" + height="18" + layout="topleft" + left="1" + length="1" + name="succeeded_lbl" + right="-1" + text_color="0.2 0.5 0.2 1" + top="4" + translate="false" + type="string"> + Succeeded + </text> + </panel> + <panel + background_visible="true" + bg_alpha_color="1 0.9 0.9 1" + follows="left|top" + font="SansSerifLarge" + halign="center" + height="20" + layout="topleft" + left_delta="0" + length="1" + name="failed_panel" + right="-1" + top="0" + type="string" + visible="false"> + <text + follows="all" + font="SansSerif" + halign="center" + height="18" + layout="topleft" + left="1" + length="1" + name="failed_lbl" + right="-1" + text_color="0.5 0.2 0.2 1" + top="4" + translate="false" + type="string"> + Failed + </text> + </panel> + <loading_indicator + follows="left|top" + height="48" + layout="topleft" + name="working_indicator" + left="101" + top="46" + visible="false" + width="48" /> + <text + follows="left|top|right" + font="SansSerifBold" + height="14" + layout="topleft" + left="5" + length="1" + halign="center" + name="working_lbl" + right="-5" + top="98" + translate="false" + type="string" + visible="false" + width="130"> + Working + </text> + <button + follows="left|top" + height="22" + image_overlay="Refresh_Off" + layout="topleft" + left="20" + name="new_snapshot_btn" + bottom="-20" + visible="false" + width="22" /> + <text + follows="left|top" + font="SansSerifBold" + halign="left" + height="18" + layout="topleft" + left_pad="10" + length="1" + name="refresh_lbl" + right="-5" + text_color="red" + top_delta="0" + translate="false" + type="string" + visible="false" + width="130"> + Refresh to save. + </text> + </ui_ctrl> + <view_border + bevel_style="in" + height="21" + width="250" + layout="topleft" + name="img_info_border" + top_pad="3" + follows="left|top" + left_delta="0" + /> + <text + type="string" + font="SansSerifSmall" + length="1" + follows="left|top" + height="14" + layout="topleft" + left_delta="5" + halign="left" + name="image_res_text" + top_delta="5" + width="100"> + [WIDTH] x [HEIGHT] px + </text> + <text + follows="left|top" + font="SansSerifSmall" + height="14" + layout="topleft" + left="200" + length="1" + halign="right" + name="file_size_label" + top_delta="0" + type="string" + width="50"> + [SIZE] KB + </text> + <panel_container follows="left|top" - height="13" - layout="topleft" - left="10" - name="layer_type_label" - top_pad="5" - width="50"> - Capture: - </text> - <combo_box - height="23" - label="Image Layers" + height="260" layout="topleft" - left="30" - name="layer_types" - width="145"> - <combo_box.item - label="Colors" - name="Colors" - value="colors" /> - <combo_box.item - label="Depth" - name="Depth" - value="depth" /> - </combo_box> - <check_box - label="Interface" - layout="topleft" - left="30" - top_pad="10" - width="180" - name="ui_check" /> - <check_box - label="HUDs" - layout="topleft" - left="30" + left="0" + name="panel_container" + default_panel_name="panel_snapshot_options" top_pad="10" - width="180" - name="hud_check" /> - <check_box - label="Keep open after saving" - layout="topleft" - left="10" - top_pad="8" - width="180" - name="keep_open_check" /> - <check_box - label="Freeze frame (fullscreen)" - layout="topleft" - left="10" - top_pad="8" - width="180" - name="freeze_frame_check" /> - <check_box - label="Auto-refresh" + width="270"> + <panel + class="llpanelsnapshotoptions" + filename="panel_snapshot_options.xml" + follows="all" + layout="topleft" + left="0" + name="panel_snapshot_options" + top="0" /> + <panel + class="llpanelsnapshotprofile" + follows="all" + layout="topleft" + name="panel_snapshot_profile" + filename="panel_snapshot_profile.xml" /> + <panel + class="llpanelsnapshotpostcard" + follows="all" + layout="topleft" + name="panel_snapshot_postcard" + filename="panel_snapshot_postcard.xml" /> + <panel + class="llpanelsnapshotinventory" + follows="all" + layout="topleft" + name="panel_snapshot_inventory" + filename="panel_snapshot_inventory.xml" /> + <panel + class="llpanelsnapshotlocal" + follows="all" + layout="topleft" + name="panel_snapshot_local" + filename="panel_snapshot_local.xml" /> + </panel_container> + <panel + height="295" layout="topleft" - left="10" - top_pad="8" - width="180" - name="auto_snapshot_check" /> + left="270" + name="advanced_options_panel" + top="20" + width="200"> + <text + type="string" + font="SansSerifSmall" + length="1" + follows="left|top" + height="14" + layout="topleft" + left="10" + halign="left" + name="advanced_options_label" + right="-10" + top="10"> + ADVANCED OPTIONS + </text> + <view_border + bevel_style="in" + follows="left|top|right" + height="1" + left="10" + layout="topleft" + name="advanced_options_hr" + right="-10" + top_pad="5" + /> + <text + type="string" + length="1" + follows="left|top" + height="13" + layout="topleft" + left="10" + name="layer_type_label" + top_pad="10" + width="50"> + Capture: + </text> + <combo_box + follows="left|top|right" + height="23" + label="Image Layers" + layout="topleft" + left="30" + name="layer_types" + right="-10"> + <combo_box.item + label="Colors" + name="Colors" + value="colors" /> + <combo_box.item + label="Depth" + name="Depth" + value="depth" /> + </combo_box> + <check_box + label="Interface" + layout="topleft" + left="30" + top_pad="10" + width="180" + name="ui_check" /> + <check_box + label="HUDs" + layout="topleft" + left="30" + top_pad="10" + width="180" + name="hud_check" /> + <check_box + label="Freeze frame (fullscreen)" + layout="topleft" + left="10" + top_pad="8" + width="180" + name="freeze_frame_check" /> + <check_box + label="Auto-refresh" + layout="topleft" + left="10" + top_pad="8" + width="180" + name="auto_snapshot_check" /> + </panel> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_sound_devices.xml b/indra/newview/skins/default/xui/en/floater_sound_devices.xml index 74e01f359c..dec0e9b6c6 100644 --- a/indra/newview/skins/default/xui/en/floater_sound_devices.xml +++ b/indra/newview/skins/default/xui/en/floater_sound_devices.xml @@ -6,6 +6,7 @@ can_minimize="true" can_resize="false" can_close="false" + chrome="true" save_dock_state="true" save_visibility="true" save_rect="true" @@ -14,7 +15,7 @@ height="164" layout="topleft" name="floater_sound_devices" - title="Sound Devices" + title="SOUND DEVICES" width="490"> <panel layout="topleft" diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml index 406114294d..2fd932786b 100644 --- a/indra/newview/skins/default/xui/en/floater_stats.xml +++ b/indra/newview/skins/default/xui/en/floater_stats.xml @@ -2,7 +2,6 @@ <floater legacy_header_height="18" can_resize="true" - follows="top|right" height="400" layout="topleft" name="Statistics" diff --git a/indra/newview/skins/default/xui/en/floater_sys_well.xml b/indra/newview/skins/default/xui/en/floater_sys_well.xml index 005952f3f2..ecedb27438 100644 --- a/indra/newview/skins/default/xui/en/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/en/floater_sys_well.xml @@ -2,9 +2,6 @@ <floater legacy_header_height="18" bevel_style="in" - left="0" - top="0" - follows="right|bottom" layout="topleft" name="sys_well_window" help_topic="notification_chiclet" @@ -18,6 +15,7 @@ can_resize="true" can_drag_on_left="false" can_dock="true" + save_dock_state="true" save_visibility="true" single_instance="true" > diff --git a/indra/newview/skins/default/xui/en/floater_telehub.xml b/indra/newview/skins/default/xui/en/floater_telehub.xml index da412ed8a0..547613fb67 100644 --- a/indra/newview/skins/default/xui/en/floater_telehub.xml +++ b/indra/newview/skins/default/xui/en/floater_telehub.xml @@ -4,7 +4,6 @@ legacy_header_height="18" height="250" layout="topleft" - left="300" name="telehub" help_topic="telehub" title="TELEHUB" diff --git a/indra/newview/skins/default/xui/en/floater_test_button.xml b/indra/newview/skins/default/xui/en/floater_test_button.xml index bf0a774e76..9bc05107a2 100644 --- a/indra/newview/skins/default/xui/en/floater_test_button.xml +++ b/indra/newview/skins/default/xui/en/floater_test_button.xml @@ -78,7 +78,6 @@ <button bottom_delta="30" height="23" - highlight_color="EmphasisColor" label="Highlight" layout="topleft" name="highlight_color_button" /> diff --git a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml new file mode 100644 index 0000000000..067c1fed82 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + can_resize="true" + height="500" + layout="topleft" + name="floater_test_toolbar" + translate="false" + width="500"> + <toolbar name="test_toolbar_top" + button_display_mode="icons_with_text" + follows="left|right|top" + height="50" + width="500" + left="0" + top="20" + min_button_width="0" + max_button_width="100" + side="top"> + <command name="avatar"/> + <command name="build"/> + <command name="chat"/> + </toolbar> + <toolbar name="test_toolbar_left" + button_display_mode="icons_with_text" + follows="left|bottom|top" + height="380" + width="200" + left="0" + top="70" + min_button_width="100" + side="left"> + <command name="avatar"/> + <command name="build"/> + <command name="chat"/> + </toolbar> + <toolbar name="test_toolbar_right" + button_display_mode="icons_with_text" + follows="right|bottom|top" + height="380" + width="200" + right="500" + top="70" + side="right"> + <command name="avatar"/> + <command name="build"/> + <command name="chat"/> + </toolbar> + <toolbar name="test_toolbar_bottom" + button_display_mode="icons_with_text" + follows="left|right|bottom" + height="50" + width="500" + left="0" + bottom="500" + min_button_width="100" + side="bottom"> + <command name="avatar"/> + <command name="build"/> + <command name="chat"/> + </toolbar> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 9b02f7d273..f9147ea650 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + open_positioning="cascading" legacy_header_height="18" - follows="left|top|right" height="580" layout="topleft" bg_opaque_image="Window_NoTitle_Foreground" @@ -515,7 +515,8 @@ image_disabled_selected="Object_Grass" image_selected="Object_Grass_Selected" image_unselected="Object_Grass" - image_overlay_color="Red" + image_overlay_color="1 0 0 .75" + image_overlay_selected_color="1 0 0 1" layout="topleft" left_delta="29" name="ToolGrass" @@ -789,6 +790,7 @@ tab_min_width="40" tab_position="top" tab_height="25" + open_tabs_on_drag_and_drop="true" top="173" width="295"> diff --git a/indra/newview/skins/default/xui/en/floater_toybox.xml b/indra/newview/skins/default/xui/en/floater_toybox.xml new file mode 100644 index 0000000000..493d44a9cf --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_toybox.xml @@ -0,0 +1,114 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + can_close="true" + can_dock="false" + can_minimize="false" + can_resize="false" + default_tab_group="1" + height="330" + help_topic="toybox" + layout="topleft" + legacy_header_height="18" + name="Toybox" + open_positioning="centered" + save_rect="true" + single_instance="true" + title="TOOLBAR BUTTONS" + width="650"> + <text + follows="left|top" + font="SansSerifMedium" + valign="bottom" + halign="left" + height="20" + layout="topleft" + left="20" + length="1" + name="toybox label 1" + right="-20" + top="35" + type="string"> + Add or remove buttons by dragging them to or from the toolbars. + </text> + <text + follows="left|top" + font="SansSerifMedium" + valign="bottom" + halign="left" + height="20" + layout="topleft" + left="20" + length="1" + name="toybox label 2" + right="-20" + top="55" + type="string"> + Buttons will appear as shown or as icon-only depending on each toolbar's settings. + </text> + <toolbar + bottom="265" + button_display_mode="icons_with_text" + follows="all" + left="20" + button_icon_and_text.button_width.max="140" + button_icon_and_text.button_width.min="70" + name="toybox_toolbar" + pad_left="5" + pad_right="5" + pad_top="5" + pad_bottom="5" + pad_between="15" + read_only="true" + right="-20" + side="top" + top="85"> + <button_panel background_visible="false" /> + <button_icon_and_text image_unselected="PushButton_Off" + image_selected="PushButton_Off" + image_disabled_selected="PushButton_Disabled" + image_disabled="PushButton_Disabled" + label_color="ButtonLabelColor" + label_color_selected="ButtonLabelColor" + label_color_disabled="ButtonLabelDisabledColor" + label_color_disabled_selected="ButtonLabelDisabledColor" + image_color="ButtonImageColor" + image_color_disabled="ButtonImageColor" + flash_color="ButtonUnselectedFgColor" + halign="left" + hover_glow_amount="0.15" + sound_flags="0" + display_pressed_state="false" /> + </toolbar> + <panel + bevel_style="none" + border="true" + bottom="266" + follows="left|bottom|right" + left="20" + right="-20" + top="266" /> + <button + follows="left|bottom|right" + height="23" + label="Clear all toolbars" + label_selected="Clear all toolbars" + layout="topleft" + left="185" + name="btn_clear_all" + top="285" + width="130"> + <button.commit_callback function="Toybox.ClearAll" /> + </button> + <button + follows="left|bottom|right" + height="23" + label="Restore defaults" + label_selected="Restore defaults" + layout="topleft" + left="335" + name="btn_restore_defaults" + top="285" + width="130"> + <button.commit_callback function="Toybox.RestoreDefaults" /> + </button> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_translation_settings.xml b/indra/newview/skins/default/xui/en/floater_translation_settings.xml new file mode 100644 index 0000000000..a212ce7889 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_translation_settings.xml @@ -0,0 +1,244 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + height="310" + layout="topleft" + name="floater_translation_settings" + help_topic="translation_settings" + save_rect="true" + title="CHAT TRANSLATION SETTINGS" + width="485"> + + <string name="bing_api_key_not_verified">Bing appID not verified. Please try again.</string> + <string name="google_api_key_not_verified">Google API key not verified. Please try again.</string> + + <string name="bing_api_key_verified">Bing appID verified.</string> + <string name="google_api_key_verified">Google API key verified.</string> + + <check_box + height="16" + label="Enable machine translation while chatting" + layout="topleft" + left="10" + name="translate_chat_checkbox" + top="30" + width="20" /> + <text + height="20" + follows="left|top" + layout="topleft" + left="40" + name="translate_language_label" + top_pad="20" + width="130"> + Translate chat into: + </text> + <combo_box + allow_text_entry="true" + follows="left|top" + height="23" + left_pad="10" + max_chars="135" + mouse_opaque="true" + name="translate_language_combo" + top_delta="-5" + width="190"> + <combo_box.item + label="System Default" + name="System Default Language" + value="default" /> + <combo_box.item + label="English" + name="English" + value="en" /> + <!-- After "System Default" and "English", please keep the rest of these combo_box.items in alphabetical order by the first character in the string. --> + <combo_box.item + label="Dansk (Danish)" + name="Danish" + value="da" /> + <combo_box.item + label="Deutsch (German)" + name="German" + value="de" /> + <combo_box.item + label="Español (Spanish)" + name="Spanish" + value="es" /> + <combo_box.item + label="Français (French)" + name="French" + value="fr" /> + <combo_box.item + label="Italiano (Italian)" + name="Italian" + value="it" /> + <combo_box.item + label="Magyar (Hungarian)" + name="Hungarian" + value="hu" /> + <combo_box.item + label="Nederlands (Dutch)" + name="Dutch" + value="nl" /> + <combo_box.item + label="Polski (Polish)" + name="Polish" + value="pl" /> + <combo_box.item + label="Português (Portuguese)" + name="Portugese" + value="pt" /> + <combo_box.item + label="Русский (Russian)" + name="Russian" + value="ru" /> + <combo_box.item + label="Türkçe (Turkish)" + name="Turkish" + value="tr" /> + <combo_box.item + label="Українська (Ukrainian)" + name="Ukrainian" + value="uk" /> + <combo_box.item + label="中文 (正體) (Chinese)" + name="Chinese" + value="zh" /> + <combo_box.item + label="日本語 (Japanese)" + name="Japanese" + value="ja" /> + <combo_box.item + label="한국어 (Korean)" + name="Korean" + value="ko" /> + </combo_box> + + <text + follows="top|left|right" + height="15" + layout="topleft" + left="40" + name="tip" + top_pad="20" + width="330" + wrap="true"> + Choose translation service: + </text> + + <radio_group + follows="top|left" + height="80" + layout="topleft" + left_delta="10" + name="translation_service_rg" + top_pad="20" + width="320"> + <radio_item + initial_value="bing" + label="Bing Translator" + layout="topleft" + name="bing" /> + <radio_item + initial_value="google" + label="Google Translate" + layout="topleft" + name="google" + top_pad="55" /> + </radio_group> + + <text + type="string" + length="1" + follows="top|right" + height="20" + layout="topleft" + left="70" + name="bing_api_key_label" + top_pad="-55" + width="85"> + Bing [http://www.bing.com/developers/createapp.aspx AppID]: + </text> + <line_editor + default_text="Enter Bing AppID and click "Verify"" + follows="top|left" + height="20" + layout="topleft" + left_pad="10" + max_length_chars="50" + top_delta="-4" + name="bing_api_key" + width="210" /> + <button + follows="left|top" + height="23" + label="Verify" + layout="topleft" + left_pad="10" + name="verify_bing_api_key_btn" + top_delta="-2" + width="90" /> + + <text + follows="top|right" + height="20" + layout="topleft" + left="70" + length="1" + name="google_api_key_label" + top_pad="50" + type="string" + width="85"> + Google [http://code.google.com/apis/language/translate/v2/getting_started.html#auth API key]: + </text> + <line_editor + default_text="Enter Google API key and click "Verify"" + follows="top|left" + height="20" + layout="topleft" + left_pad="10" + max_length_chars="50" + top_delta="-4" + name="google_api_key" + width="210" /> + <button + follows="left|top" + height="23" + label="Verify" + layout="topleft" + left_pad="10" + name="verify_google_api_key_btn" + top_delta="-2" + width="90" /> + + <text + follows="top|right" + height="20" + layout="topleft" + left="185" + length="1" + name="google_links_text" + top_delta="-23" + type="string" + width="100"> + [http://code.google.com/apis/language/translate/v2/pricing.html Pricing] | [https://code.google.com/apis/console Stats] + </text> + + <button + follows="left|top" + height="23" + label="OK" + layout="topleft" + right="-120" + name="ok_btn" + top="-30" + width="100" /> + <button + follows="left|top" + height="23" + label="Cancel" + layout="topleft" + left_pad="10" + name="cancel_btn" + width="100" /> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml index f017a7ace6..6807b01fa3 100644 --- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml @@ -1,15 +1,17 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + open_positioning="cascading" can_resize="true" can_minimize="true" - can_close="false" + can_close="true" + chrome="true" height="205" layout="topleft" min_height="124" min_width="190" name="floater_voice_controls" help_topic="floater_voice_controls" - title="Voice Controls" + title="VOICE CONTROLS" save_dock_state="true" save_visibility="true" save_rect="true" @@ -17,19 +19,19 @@ width="282"> <string name="title_nearby"> - NEARBY VOICE + VOICE SETTINGS </string> <string name="title_group"> - Group Call with [GROUP] + GROUP CALL WITH [GROUP] </string> <string name="title_adhoc"> - Conference Call + CONFERENCE CALL </string> <string name="title_peer_2_peer"> - Call with [NAME] + CALL WITH [NAME] </string> <string name="no_one_near"> @@ -50,6 +52,7 @@ user_resize="false" auto_resize="false" layout="topleft" + min_height="20" height="20" name="my_panel"> <avatar_icon @@ -86,7 +89,7 @@ visible="true" width="20" /> </layout_panel> - <layout_panel name="leave_call_panel" height="26" auto_resize="false"> + <layout_panel name="leave_call_panel" height="26" min_height="26" user_resize="false" auto_resize="false"> <layout_stack clip="true" follows="left|top|right" @@ -131,6 +134,7 @@ height="132" name="callers_panel" user_resize="false" + auto_resize="true" width="280"> <avatar_list follows="all" diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml index 2c754cd8d0..77fb21e27c 100644 --- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml @@ -7,7 +7,6 @@ help_topic="voice_effects" title="VOICE MORPHING" background_visible="true" - follows="all" label="Places" layout="topleft" min_height="360" diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml index 0eda9ae62a..57d1c92acb 100644 --- a/indra/newview/skins/default/xui/en/floater_web_content.xml +++ b/indra/newview/skins/default/xui/en/floater_web_content.xml @@ -9,7 +9,6 @@ name="floater_web_content" help_topic="floater_web_content" save_rect="true" - auto_tile="true" title="" initial_mime_type="text/html" width="780"> diff --git a/indra/newview/skins/default/xui/en/floater_web_profile.xml b/indra/newview/skins/default/xui/en/floater_web_profile.xml new file mode 100644 index 0000000000..d0225f78a9 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_web_profile.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater name="floater_web_profile" + help_topic="web_profile" + width="780" + height="775" + filename="floater_web_content.xml"/>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml index 019e7cd032..56d79f62c7 100644 --- a/indra/newview/skins/default/xui/en/floater_world_map.xml +++ b/indra/newview/skins/default/xui/en/floater_world_map.xml @@ -2,7 +2,7 @@ <floater legacy_header_height="18" can_resize="true" - open_centered="true" + open_positioning="centered" height="600" layout="topleft" min_height="520" @@ -468,7 +468,7 @@ left="3" top_pad="7" mouse_opaque="true" - name="region_icon" + name="location_icon" width="16" /> <search_editor follows="top|right" diff --git a/indra/newview/skins/default/xui/en/inspect_remote_object.xml b/indra/newview/skins/default/xui/en/inspect_remote_object.xml index ef3dd844cd..e83257d2a0 100644 --- a/indra/newview/skins/default/xui/en/inspect_remote_object.xml +++ b/indra/newview/skins/default/xui/en/inspect_remote_object.xml @@ -36,7 +36,7 @@ height="16" left="8" name="object_owner_label" - width="55" + width="65" top_pad="12"> Owner: </text> diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml index a7d1aa963c..b4be17e677 100644 --- a/indra/newview/skins/default/xui/en/main_view.xml +++ b/indra/newview/skins/default/xui/en/main_view.xml @@ -11,130 +11,68 @@ <layout_stack border_size="0" follows="all" mouse_opaque="false" - height="749" + height="768" name="menu_stack" orientation="vertical" - top="19"> + top="0"> + <layout_panel mouse_opaque="true" + follows="left|right|top" + name="status_bar_container" + tab_stop="false" + height="19" + left="0" + top="0" + width="1024" + user_resize="false" + auto_resize="false" + visible="true"> + <view mouse_opaque="false" + follows="all" + name="menu_bar_holder" + left="0" + top="0" + width="1024" + height="19"/> + </layout_panel> <layout_panel auto_resize="false" - height="60" + height="34" mouse_opaque="false" name="nav_bar_container" tab_stop="false" width="1024" - user_resize="false" - visible="false"> - </layout_panel> - <layout_panel auto_resize="true" + user_resize="false" + visible="false"/> + <layout_panel auto_resize="true" follows="all" height="500" layout="topleft" mouse_opaque="false" tab_stop="false" - name="hud" + name="world_panel" width="1024"> - <layout_stack border_size="0" - follows="all" - height="500" - left="0" - mouse_opaque="false" - name="hud_stack" - orientation="horizontal" - top="0" - width="1024"> - <layout_panel auto_resize="true" - follows="all" - height="500" - layout="topleft" - mouse_opaque="false" - tab_stop="false" - name="non_side_tray_view" - user_resize="false" - width="500"> - <view bottom="500" - follows="all" - height="500" - left="0" - mouse_opaque="false" - name="world_view_rect" - width="500"/> - <layout_stack border_size="0" - bottom="500" - follows="all" - height="500" - left="0" - mouse_opaque="false" - name="world_stack" - orientation="vertical"> - <layout_panel auto_resize="true" - follows="all" - height="500" - layout="topleft" - tab_stop="false" - mouse_opaque="false" - user_resize="false" - name="hud container" - width="500"> - <view top="0" - follows="all" - height="500" - left="0" - mouse_opaque="false" - name="floater_snap_region" - width="500"/> - <panel follows="left|top" - height="19" - left="0" - mouse_opaque="false" - name="topinfo_bar_container" - tab_stop="false" - top="0" - visible="false" - width="1024"/> - <panel follows="right|top|bottom" - height="500" - mouse_opaque="false" - name="side_bar_tabs" - right="500" - tab_stop="false" - top="0" - width="32"/> - <panel bottom="500" - follows="left|right|bottom" - height="25" - left="0" - mouse_opaque="false" - tab_stop="false" - name="stand_stop_flying_container" - visible="false" - width="500"/> - </layout_panel> - <layout_panel auto_resize="false" - min_height="33" - height="33" - mouse_opaque="false" - name="bottom_tray_container" - visible="false"/> - </layout_stack> - </layout_panel> - <!-- side tray --> - <layout_panel auto_resize="false" - follows="top|bottom" - height="500" - min_width="333" - mouse_opaque="false" - tab_stop="false" - name="side_tray_container" - user_resize="false" - visible="false" - width="333"/> - </layout_stack> + <view top="0" + follows="all" + height="500" + left="0" + mouse_opaque="false" + name="world_view_rect" + width="1024"/> + <panel follows="left|top|right" + height="19" + left="0" + mouse_opaque="false" + name="topinfo_bar_container" + tab_stop="false" + top="0" + visible="false" + width="1024"/> <panel top="0" - follows="all" - height="500" - mouse_opaque="false" - name="login_panel_holder" - width="1024"/> - + left="0" + follows="all" + height="500" + mouse_opaque="false" + name="login_panel_holder" + width="1024"/> <debug_view follows="all" left="0" top="0" @@ -142,45 +80,27 @@ height="500" name="DebugView" width="1024"/> - - <panel follows="all" + <floater_view follows="all" height="500" left="0" mouse_opaque="false" - name="floater_view_holder" + name="Floater View" tab_group="-1" tab_stop="false" top="0" - width="1024"> - <floater_view follows="all" - height="500" - left="0" - mouse_opaque="false" - name="Floater View" - tab_group="-1" - tab_stop="false" - top="0" - width="1024"/> - </panel> + width="1024"/> + <panel name="toolbar_view_holder" + follows="all" + layout="topleft" + height="500" + width="1024" + top="0" + left="0" + mouse_opaque="false" + tab_stop="false"/> </layout_panel> </layout_stack> - <panel mouse_opaque="false" - follows="left|right|top" - name="status_bar_container" - tab_stop="false" - height="19" - left="0" - top="0" - width="1024" - visible="false"/> - - <view mouse_opaque="false" - follows="all" - name="menu_bar_holder" - left="0" - top="0" - width="1024" - height="768"/> + <panel top="0" follows="all" mouse_opaque="false" diff --git a/indra/newview/skins/default/xui/en/menu_bottomtray.xml b/indra/newview/skins/default/xui/en/menu_bottomtray.xml deleted file mode 100644 index 07dabe1909..0000000000 --- a/indra/newview/skins/default/xui/en/menu_bottomtray.xml +++ /dev/null @@ -1,163 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<menu - height="201" - layout="topleft" - left="100" - mouse_opaque="false" - name="hide_camera_move_controls_menu" - top="624" - visible="false" - width="128"> - <menu_item_check - label="Speak Button" - layout="topleft" - name="EnableVoiceChat"> - <menu_item_check.on_click - function="ToggleControl" - parameter="EnableVoiceChat" /> - <menu_item_check.on_check - function="CheckControl" - parameter="EnableVoiceChat" /> - </menu_item_check> - <menu_item_check - label="Gesture button" - layout="topleft" - name="ShowGestureButton"> - <menu_item_check.on_click - function="ToggleControl" - parameter="ShowGestureButton" /> - <menu_item_check.on_check - function="CheckControl" - parameter="ShowGestureButton" /> - </menu_item_check> - <menu_item_check - label="Move button" - layout="topleft" - name="ShowMoveButton"> - <menu_item_check.on_click - function="ToggleControl" - parameter="ShowMoveButton" /> - <menu_item_check.on_check - function="CheckControl" - parameter="ShowMoveButton" /> - </menu_item_check> - <menu_item_check - label="View button" - layout="topleft" - name="ShowCameraButton"> - <menu_item_check.on_click - function="ToggleControl" - parameter="ShowCameraButton" /> - <menu_item_check.on_check - function="CheckControl" - parameter="ShowCameraButton" /> - </menu_item_check> - <menu_item_check - label="Snapshot button" - layout="topleft" - name="ShowSnapshotButton"> - <menu_item_check.on_click - function="ToggleControl" - parameter="ShowSnapshotButton" /> - <menu_item_check.on_check - function="CheckControl" - parameter="ShowSnapshotButton" /> - </menu_item_check> - <menu_item_check - label="Build button" - layout="topleft" - name="ShowBuildButton"> - <menu_item_check.on_click - function="ToggleControl" - parameter="ShowBuildButton" /> - <menu_item_check.on_check - function="CheckControl" - parameter="ShowBuildButton" /> - </menu_item_check> - <menu_item_check - label="Search button" - layout="topleft" - name="ShowSearchButton"> - <menu_item_check.on_click - function="ToggleControl" - parameter="ShowSearchButton" /> - <menu_item_check.on_check - function="CheckControl" - parameter="ShowSearchButton" /> - </menu_item_check> - <menu_item_check - label="Map button" - layout="topleft" - name="ShowWorldMapButton"> - <menu_item_check.on_click - function="ToggleControl" - parameter="ShowWorldMapButton" /> - <menu_item_check.on_check - function="CheckControl" - parameter="ShowWorldMapButton" /> - </menu_item_check> - <menu_item_check - label="Mini-Map button" - layout="topleft" - name="ShowMiniMapButton"> - <menu_item_check.on_click - function="ToggleControl" - parameter="ShowMiniMapButton" /> - <menu_item_check.on_check - function="CheckControl" - parameter="ShowMiniMapButton" /> - </menu_item_check> - <menu_item_separator - name="Separator" /> - <menu_item_call - label="Cut" - name="NearbyChatBar_Cut"> - <menu_item_call.on_click - function="NearbyChatBar.Action" - parameter="cut" /> - <menu_item_call.on_enable - function="NearbyChatBar.EnableMenuItem" - parameter="can_cut" /> - </menu_item_call> - <menu_item_call - label="Copy" - name="NearbyChatBar_Copy"> - <menu_item_call.on_click - function="NearbyChatBar.Action" - parameter="copy" /> - <menu_item_call.on_enable - function="NearbyChatBar.EnableMenuItem" - parameter="can_copy" /> - </menu_item_call> - <menu_item_call - label="Paste" - name="NearbyChatBar_Paste"> - <menu_item_call.on_click - function="NearbyChatBar.Action" - parameter="paste" /> - <menu_item_call.on_enable - function="NearbyChatBar.EnableMenuItem" - parameter="can_paste" /> - </menu_item_call> - <menu_item_call - label="Delete" - name="NearbyChatBar_Delete"> - <menu_item_call.on_click - function="NearbyChatBar.Action" - parameter="delete" /> - <menu_item_call.on_enable - function="NearbyChatBar.EnableMenuItem" - parameter="can_delete" /> - </menu_item_call> - <menu_item_call - label="Select All" - name="NearbyChatBar_Select_All"> - <menu_item_call.on_click - function="NearbyChatBar.Action" - parameter="select_all" /> - <menu_item_call.on_enable - function="NearbyChatBar.EnableMenuItem" - parameter="can_select_all" /> - </menu_item_call> - -</menu> diff --git a/indra/newview/skins/default/xui/en/menu_hide_navbar.xml b/indra/newview/skins/default/xui/en/menu_hide_navbar.xml index 3f38d734b9..b517fd7957 100644 --- a/indra/newview/skins/default/xui/en/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/en/menu_hide_navbar.xml @@ -9,7 +9,7 @@ visible="false" width="128"> <menu_item_check - label="Show Navigation Bar" + label="Show Navigation & Favorites Bar" layout="topleft" name="ShowNavbarNavigationPanel"> <on_click @@ -20,17 +20,6 @@ parameter="ShowNavbarNavigationPanel" /> </menu_item_check> <menu_item_check - label="Show Favorites Bar" - layout="topleft" - name="ShowNavbarFavoritesPanel"> - <on_click - function="ToggleControl" - parameter="ShowNavbarFavoritesPanel" /> - <on_check - function="CheckControl" - parameter="ShowNavbarFavoritesPanel" /> - </menu_item_check> - <menu_item_check label="Show Mini-Location Bar" layout="topleft" name="ShowMiniLocationPanel"> diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml index 4c4ff3e5c4..8ac1ac9e09 100644 --- a/indra/newview/skins/default/xui/en/menu_login.xml +++ b/indra/newview/skins/default/xui/en/menu_login.xml @@ -13,7 +13,7 @@ tear_off="true" name="File"> <menu_item_call - label="Preferences" + label="Preferences..." name="Preferences..." shortcut="control|P"> <menu_item_call.on_click @@ -93,14 +93,6 @@ parameter="ui_preview" /> </menu_item_call> <menu_item_separator /> - <!-- Broken - <menu_item_call - label="Show Side Tray" - name="Show Side Tray"> - <menu_item_call.on_click - function="Advanced.ShowSideTray" /> - </menu_item_call> - --> <menu create_jump_keys="true" label="UI Tests" @@ -175,13 +167,6 @@ function="Floater.Show" parameter="message_critical" /> </menu_item_call> - <menu_item_call - label="Media Browser Test" - name="Web Browser Test"> - <menu_item_call.on_click - function="Advanced.WebBrowserTest" - parameter="http://join.secondlife.com/"/> - </menu_item_call> <menu_item_call label="Web Content Floater Debug Test" name="Web Content Floater Debug Test"> diff --git a/indra/newview/skins/default/xui/en/menu_mode_change.xml b/indra/newview/skins/default/xui/en/menu_mode_change.xml deleted file mode 100644 index 87d1a0a7a2..0000000000 --- a/indra/newview/skins/default/xui/en/menu_mode_change.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<toggleable_menu - name="Mode Change"> - <menu_item_check - label="Basic" - name="BasicMode"> - <on_check - function="CheckSessionSettings" - parameter="settings_minimal.xml" /> - <on_click - function="ChangeMode" - parameter="basic"/> - </menu_item_check> - <menu_item_check - label="Advanced" - name="AdvancedMode"> - <on_check - function="CheckSessionSettings" - parameter="" /> - <on_click - function="ChangeMode" - parameter="advanced"/> - </menu_item_check> - </toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml index 29eeb93ac1..b452f96e7a 100644 --- a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml +++ b/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml @@ -42,6 +42,6 @@ </menu_item_check> <menu_item_separator layout="topleft" /> <menu_item_call name="show_blocked_list" label="Show Blocked Residents & Objects"> - <menu_item_call.on_click function="SideTray.ShowPanel" parameter="panel_block_list_sidetray" /> + <menu_item_call.on_click function="People.Friends.ViewSort.Action" parameter="panel_block_list_sidetray" /> </menu_item_call> </toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml index 65bd2793b6..614dd693c5 100644 --- a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml +++ b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml @@ -52,6 +52,6 @@ </menu_item_check> <menu_item_separator layout="topleft" /> <menu_item_call name="show_blocked_list" label="Show Blocked Residents & Objects"> - <menu_item_call.on_click function="SideTray.ShowPanel" userdata="panel_block_list_sidetray" /> + <menu_item_call.on_click function="People.Nearby.ViewSort.Action" userdata="panel_block_list_sidetray" /> </menu_item_call> </toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml index 0634e3bd3b..485a5a658c 100644 --- a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml +++ b/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml @@ -34,6 +34,6 @@ </menu_item_check> <menu_item_separator layout="topleft" /> <menu_item_call name="show_blocked_list" label="Show Blocked Residents & Objects"> - <menu_item_call.on_click function="SideTray.ShowPanel" userdata="panel_block_list_sidetray" /> + <menu_item_call.on_click function="People.Recent.ViewSort.Action" userdata="panel_block_list_sidetray" /> </menu_item_call> </toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/menu_toolbars.xml b/indra/newview/skins/default/xui/en/menu_toolbars.xml new file mode 100644 index 0000000000..fbe40a7244 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_toolbars.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + layout="topleft" + name="Toolbars Popup" + visible="false"> + <menu_item_call label="Remove this button" + layout="topleft" + name="Remove button"> + <menu_item_call.on_click function="Toolbars.RemoveSelectedCommand" /> + </menu_item_call> + <menu_item_separator layout="topleft" /> + <menu_item_call label="Toolbar buttons..." + layout="topleft" + name="Choose Buttons"> + <menu_item_call.on_click function="Floater.Show" + parameter="toybox" /> + </menu_item_call> + <menu_item_separator layout="topleft" /> + <menu_item_check label="Icons and labels" + layout="topleft" + name="icons_with_text"> + <on_click function="Toolbars.EnableSetting" + parameter="icons_with_text" /> + <on_check function="Toolbars.CheckSetting" + parameter="icons_with_text" /> + </menu_item_check> + <menu_item_check label="Icons only" + layout="topleft" + name="icons_only"> + <on_click function="Toolbars.EnableSetting" + parameter="icons_only" /> + <on_check function="Toolbars.CheckSetting" + parameter="icons_only" /> + </menu_item_check> +</context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 16f48f3a4e..0aa5c72f2a 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -8,8 +8,180 @@ label="Me" name="Me" tear_off="true"> + <menu_item_call + label="Profile..." + name="Profile"> + <menu_item_call.on_click + function="ShowAgentProfile" + parameter="agent" /> + </menu_item_call> + <menu_item_call + label="Appearance..." + name="ChangeOutfit"> + <menu_item_call.on_click + function="CustomizeAvatar" /> + <menu_item_call.on_enable + function="Edit.EnableCustomizeAvatar" /> + </menu_item_call> + <menu_item_call + label="Choose an avatar..." + name="Avatar Picker"> + <menu_item_call.on_click + function="Floater.ToggleOrBringToFront" + parameter="avatar" /> + </menu_item_call> + <menu_item_separator/> + <menu_item_check + label="Inventory..." + name="Inventory" + shortcut="control|I" + visible="true"> + <menu_item_check.on_check + function="Floater.Visible" + parameter="inventory" /> + <menu_item_check.on_click + function="Floater.Toggle" + parameter="inventory" /> + </menu_item_check> + <menu_item_call + label="New Inventory Window" + name="NewInventoryWindow" + shortcut="control|shift|I" + visible="false"> + <menu_item_call.on_click + function="Inventory.NewWindow" + parameter="" /> + </menu_item_call> + <menu_item_call + label="Places..." + name="Places"> + <menu_item_call.on_click + function="Floater.ToggleOrBringToFront" + parameter="places" /> + </menu_item_call> + <menu_item_call + label="Picks..." + name="Picks"> + <menu_item_call.on_click + function="Floater.ToggleOrBringToFront" + parameter="picks" /> + </menu_item_call> + <menu_item_separator/> + <menu_item_call + label="Camera Controls..." + name="Camera Controls"> + <menu_item_call.on_click + function="Floater.ToggleOrBringToFront" + parameter="camera" /> + </menu_item_call> + <menu + create_jump_keys="true" + label="Movement" + name="Movement" + tear_off="true"> + <menu_item_call + label="Sit Down" + layout="topleft" + shortcut="alt|shift|S" + name="Sit Down Here"> + <menu_item_call.on_click + function="Self.SitDown" + parameter="" /> + <menu_item_call.on_enable + function="Self.EnableSitDown" /> + </menu_item_call> + <menu_item_check + label="Fly" + name="Fly" + shortcut="Home"> + <menu_item_check.on_check + function="Agent.getFlying" /> + <menu_item_check.on_click + function="Agent.toggleFlying" /> + <menu_item_check.on_enable + function="Agent.enableFlying" /> + </menu_item_check> + <menu_item_check + label="Always Run" + name="Always Run" + shortcut="control|R"> + <menu_item_check.on_check + function="World.CheckAlwaysRun" /> + <menu_item_check.on_click + function="World.AlwaysRun" /> + </menu_item_check> + <menu_item_call + label="Stop Animating Me" + name="Stop Animating My Avatar"> + <menu_item_call.on_click + function="Tools.StopAllAnimations" /> + </menu_item_call> + <menu_item_call + label="Walk / run / fly..." + name="Stop Animating My Avatar"> + <menu_item_call.on_click + function="Floater.ToggleOrBringToFront" + parameter="moveview" /> + </menu_item_call> + </menu> + + <menu + create_jump_keys="true" + label="Status" + name="Status" + tear_off="true"> <menu_item_call - label="Preferences" + label="Away" + name="Set Away"> + <menu_item_call.on_click + function="World.SetAway" /> + </menu_item_call> + <menu_item_call + label="Busy" + name="Set Busy"> + <menu_item_call.on_click + function="World.SetBusy"/> + </menu_item_call> + </menu> + + <menu_item_call + label="Request Admin Status" + name="Request Admin Options" + shortcut="control|alt|G" + visible="false"> + <menu_item_call.on_click + function="Advanced.RequestAdminStatus" /> + </menu_item_call> + <menu_item_call + label="Leave Admin Status" + name="Leave Admin Options" + shortcut="control|alt|shift|G" + visible="false"> + <menu_item_call.on_click + function="Advanced.LeaveAdminStatus" /> + </menu_item_call> + + <menu_item_separator/> + + <menu_item_call + label="Buy L$" + name="Buy and Sell L$"> + <menu_item_call.on_click + function="BuyCurrency" /> + </menu_item_call> + <menu_item_call + label="Account dashboard..." + name="Manage My Account"> + <menu_item_call.on_click + function="PromptShowURL" + name="ManageMyAccount_url" + parameter="WebLaunchJoinNow,http://secondlife.com/account/" /> + </menu_item_call> + + <menu_item_separator/> + + <menu_item_call + label="Preferences..." name="Preferences" shortcut="control|P"> <menu_item_call.on_click @@ -17,178 +189,96 @@ parameter="preferences" /> </menu_item_call> <menu_item_call - label="My Dashboard" - name="Manage My Account"> - <menu_item_call.on_click - function="PromptShowURL" - name="ManageMyAccount_url" - parameter="WebLaunchJoinNow,http://secondlife.com/account/" /> - </menu_item_call> - <menu_item_call - label="Buy L$" - name="Buy and Sell L$"> + label="Toolbar buttons..." + name="Toolbars" + shortcut="control|T"> <menu_item_call.on_click - function="BuyCurrency" /> + function="Floater.Toggle" + parameter="toybox" /> </menu_item_call> + <menu_item_call + label="Hide all controls" + name="Hide UI" + shortcut="control|shift|U"> + <menu_item_call.on_click + function="View.ToggleUI" /> + </menu_item_call> <menu_item_separator/> <menu_item_call - label="My Profile" - name="Profile"> - <menu_item_call.on_click - function="ShowAgentProfile" - parameter="agent" /> - </menu_item_call> - <menu_item_call - label="My Appearance" - name="ChangeOutfit"> + label="Exit [APP_NAME]" + name="Quit" + shortcut="control|Q"> <menu_item_call.on_click - function="CustomizeAvatar" /> - <menu_item_call.on_enable - function="Edit.EnableCustomizeAvatar" /> + function="File.Quit" /> </menu_item_call> + </menu> + <menu + create_jump_keys="true" + label="Communicate" + name="Communicate" + tear_off="true"> <menu_item_check - label="My Inventory" - name="Inventory" - shortcut="control|shift|I" - visible="false"> + label="Chat..." + name="Nearby Chat" + shortcut="control|H" + use_mac_ctrl="true"> <menu_item_check.on_check function="Floater.Visible" - parameter="inventory" /> + parameter="chat_bar" /> <menu_item_check.on_click function="Floater.Toggle" - parameter="inventory" /> + parameter="chat_bar" /> </menu_item_check> <menu_item_check - label="My Inventory" - name="ShowSidetrayInventory" - shortcut="control|I" - visible="true"> + label="Speak" + name="Speak"> <menu_item_check.on_check - function="SidetrayPanelVisible" - parameter="sidepanel_inventory" /> + function="Agent.IsMicrophoneOn" + parameter="speak" /> + <menu_item_check.on_enable + function="Agent.IsActionAllowed" + parameter="speak" /> <menu_item_check.on_click - function="ShowSidetrayPanel" - parameter="sidepanel_inventory" /> + function="Agent.ToggleMicrophone" + parameter="speak" /> </menu_item_check> <menu_item_check - label="My Gestures" - name="Gestures" - shortcut="control|G"> + label="Voice settings..." + name="Nearby Voice"> <menu_item_check.on_check function="Floater.Visible" - parameter="gestures" /> + parameter="voice_controls" /> <menu_item_check.on_click function="Floater.Toggle" - parameter="gestures" /> + parameter="voice_controls" /> </menu_item_check> <menu_item_check - label="My Voice" + label="Voice morphing..." name="ShowVoice" visibility_control="VoiceMorphingEnabled"> <menu_item_check.on_check function="Floater.Visible" - Parameter="voice_effect" /> + parameter="voice_effect" /> <menu_item_check.on_click function="Floater.Toggle" parameter="voice_effect" /> </menu_item_check> - <menu - create_jump_keys="true" - label="Movement" - name="Movement" - tear_off="true"> - <menu_item_call - label="Sit Down" - layout="topleft" - shortcut="alt|shift|S" - name="Sit Down Here"> - <menu_item_call.on_click - function="Self.SitDown" - parameter="" /> - <menu_item_call.on_enable - function="Self.EnableSitDown" /> - </menu_item_call> - <menu_item_check - label="Fly" - name="Fly" - shortcut="Home"> - <menu_item_check.on_check - function="Agent.getFlying" /> - <menu_item_check.on_click - function="Agent.toggleFlying" /> - <menu_item_check.on_enable - function="Agent.enableFlying" /> - </menu_item_check> - <menu_item_check - label="Always Run" - name="Always Run" - shortcut="control|R"> - <menu_item_check.on_check - function="World.CheckAlwaysRun" /> - <menu_item_check.on_click - function="World.AlwaysRun" /> - </menu_item_check> - <menu_item_call - label="Stop Animating Me" - name="Stop Animating My Avatar"> - <menu_item_call.on_click - function="Tools.StopAllAnimations" /> - </menu_item_call> - </menu> - <menu - create_jump_keys="true" - label="My Status" - name="Status" - tear_off="true"> - <menu_item_call - label="Away" - name="Set Away"> - <menu_item_call.on_click - function="World.SetAway" /> - </menu_item_call> - <menu_item_call - label="Busy" - name="Set Busy"> - <menu_item_call.on_click - function="World.SetBusy"/> - </menu_item_call> - </menu> - <menu_item_call - label="Request Admin Status" - name="Request Admin Options" - shortcut="control|alt|G" - visible="false"> - <menu_item_call.on_click - function="Advanced.RequestAdminStatus" /> - </menu_item_call> - <menu_item_call - label="Leave Admin Status" - name="Leave Admin Options" - shortcut="control|alt|shift|G" - visible="false"> - <menu_item_call.on_click - function="Advanced.LeaveAdminStatus" /> - </menu_item_call> - + <menu_item_check + label="Gestures..." + name="Gestures" + shortcut="control|G"> + <menu_item_check.on_check + function="Floater.Visible" + parameter="gestures" /> + <menu_item_check.on_click + function="Floater.Toggle" + parameter="gestures" /> + </menu_item_check> <menu_item_separator/> - - <menu_item_call - label="Exit [APP_NAME]" - name="Quit" - shortcut="control|Q"> - <menu_item_call.on_click - function="File.Quit" /> - </menu_item_call> - </menu> - <menu - create_jump_keys="true" - label="Communicate" - name="Communicate" - tear_off="true"> <menu_item_call - label="My Friends" + label="Friends" name="My Friends" shortcut="control|shift|F"> <menu_item_call.on_click @@ -196,71 +286,44 @@ parameter="friends_panel" /> </menu_item_call> <menu_item_call - label="My Groups" + label="Groups" name="My Groups" shortcut="control|shift|G"> <menu_item_call.on_click function="SideTray.PanelPeopleTab" parameter="groups_panel" /> </menu_item_call> - - <menu_item_separator/> - - <!--menu_item_call - label="Chat" - name="Chat"> - <menu_item_call.on_click - function="World.Chat" /> - </menu_item_call--> - <menu_item_check - label="Nearby Chat" - name="Nearby Chat" - shortcut="control|H" - use_mac_ctrl="true"> - <menu_item_check.on_check - function="Floater.Visible" - parameter="nearby_chat" /> - <menu_item_check.on_click - function="Floater.Toggle" - parameter="nearby_chat" /> - </menu_item_check> <menu_item_call - label="Nearby People" + label="Nearby people" name="Active Speakers" shortcut="control|shift|A"> <menu_item_call.on_click - function="SideTray.PanelPeopleTab" - parameter="nearby_panel" /> - </menu_item_call> - <menu_item_check - label="Nearby Voice" - name="Nearby Voice"> - <menu_item_check.on_check - function="Floater.Visible" - parameter="voice_controls" /> - <menu_item_check.on_click - function="Floater.Toggle" - parameter="voice_controls" /> - </menu_item_check> + function="SideTray.PanelPeopleTab" + parameter="nearby_panel" /> + </menu_item_call> </menu> <menu create_jump_keys="true" label="World" name="World" tear_off="true"> - <menu_item_check - label="Mini-Map" - name="Mini-Map" - shortcut="control|shift|M"> - <menu_item_check.on_check - function="Floater.Visible" - parameter="mini_map" /> - <menu_item_check.on_click - function="Floater.Toggle" - parameter="mini_map" /> - </menu_item_check> - <menu_item_check - label="World Map" + <menu_item_call + label="Landmark This Place" + name="Create Landmark Here"> + <menu_item_call.on_click + function="World.CreateLandmark" /> + <menu_item_call.on_enable + function="World.EnableCreateLandmark" /> + </menu_item_call> + <menu_item_call + label="Destinations..." + name="Destinations"> + <menu_item_call.on_click + function="Floater.ToggleOrBringToFront" + parameter="destinations" /> + </menu_item_call> + <menu_item_check + label="World map" name="World Map" shortcut="control|M" use_mac_ctrl="true"> @@ -271,6 +334,17 @@ function="Floater.Toggle" parameter="world_map" /> </menu_item_check> + <menu_item_check + label="Mini-map" + name="Mini-Map" + shortcut="control|shift|M"> + <menu_item_check.on_check + function="Floater.Visible" + parameter="mini_map" /> + <menu_item_check.on_click + function="Floater.Toggle" + parameter="mini_map" /> + </menu_item_check> <menu_item_check label="Search" name="Search" @@ -282,6 +356,25 @@ function="Floater.Toggle" parameter="search" /> </menu_item_check> + <menu_item_separator/> + <menu_item_call + label="Teleport home" + name="Teleport Home" + shortcut="control|shift|H"> + <menu_item_call.on_click + function="World.TeleportHome" /> + <menu_item_call.on_enable + function="World.EnableTeleportHome" /> + </menu_item_call> + <menu_item_call + label="Set home to here" + name="Set Home to Here"> + <menu_item_call.on_click + function="World.SetHomeLocation" /> + <menu_item_call.on_enable + function="World.EnableSetHomeLocation" /> + </menu_item_call> + <menu_item_separator/> <menu_item_call label="Snapshot" name="Take Snapshot" @@ -290,82 +383,51 @@ function="Floater.Show" parameter="snapshot" /> </menu_item_call> - <menu_item_call - label="Landmark This Place" - name="Create Landmark Here"> - <menu_item_call.on_click - function="World.CreateLandmark" /> - <menu_item_call.on_enable - function="World.EnableCreateLandmark" /> - </menu_item_call> - <menu - create_jump_keys="true" - label="Place Profile" - name="Land" - tear_off="true"> + <menu_item_separator/> <menu_item_call - label="Place Profile" + label="Place profile" layout="topleft" name="Place Profile"> <menu_item_call.on_click function="World.PlaceProfile" /> </menu_item_call> <menu_item_call - label="About Land" + label="About land" name="About Land"> <menu_item_call.on_click function="Floater.Show" parameter="about_land" /> </menu_item_call> <menu_item_call - label="Region/Estate" + label="Region / Estate" name="Region/Estate"> <menu_item_call.on_click function="Floater.Show" parameter="region_info" /> </menu_item_call> - </menu> + <menu_item_call + label="My land holdings..." + name="My Land"> + <menu_item_call.on_click + function="Floater.Show" + parameter="land_holdings" /> + </menu_item_call> + <menu_item_call + label="Buy this land" + name="Buy Land"> + <menu_item_call.on_click + function="Land.Buy" /> + <menu_item_call.on_enable + function="World.EnableBuyLand" /> + </menu_item_call> <menu_item_separator/> - <menu_item_call - label="Buy This Land" - name="Buy Land"> - <menu_item_call.on_click - function="Land.Buy" /> - <menu_item_call.on_enable - function="World.EnableBuyLand" /> - </menu_item_call> - <menu_item_call - label="My Land" - name="My Land"> - <menu_item_call.on_click - function="Floater.Show" - parameter="land_holdings" /> - </menu_item_call> <menu create_jump_keys="true" label="Show" name="LandShow" tear_off="true"> - <menu_item_check - label="Move Controls" - name="Movement Controls"> - <menu_item_check.on_check - function="Floater.Visible" - parameter="moveview" /> - <menu_item_check.on_click - function="World.Toggle.MovementControls" /> - </menu_item_check> - <menu_item_check - label="View Controls" - name="Camera Controls"> - <menu_item_check.on_check - function="Floater.Visible" - parameter="camera" /> - <menu_item_check.on_click - function="World.Toggle.CameraControls" /> - </menu_item_check> <menu_item_check label="Ban Lines" name="Ban Lines"> @@ -438,24 +500,6 @@ </menu> <menu_item_separator/> - - <menu_item_call - label="Teleport Home" - name="Teleport Home" - shortcut="control|shift|H"> - <menu_item_call.on_click - function="World.TeleportHome" /> - <menu_item_call.on_enable - function="World.EnableTeleportHome" /> - </menu_item_call> - <menu_item_call - label="Set Home to Here" - name="Set Home to Here"> - <menu_item_call.on_click - function="World.SetHomeLocation" /> - <menu_item_call.on_enable - function="World.EnableSetHomeLocation" /> - </menu_item_call> <!-- <menu_item_check label="Show Navigation Bar" name="ShowNavbarNavigationPanel"> @@ -478,8 +522,6 @@ </menu_item_check> <menu_item_separator/>--> - <menu_item_separator/> - <menu create_jump_keys="true" label="Sun" @@ -515,18 +557,26 @@ function="World.EnvSettings" parameter="midnight" /> </menu_item_call> + <menu_item_separator/> + <menu_item_call + label="Use Region Settings" + name="Use Region Settings"> + <menu_item_call.on_click + function="World.EnvSettings" + parameter="region" /> + </menu_item_call> </menu> <menu create_jump_keys="true" - label="Enviroment Editor" - name="Enviroment Editor" + label="Environment Editor" + name="Environment Editor" tear_off="true"> <menu_item_call - label="Enviroment Settings..." - name="Enviroment Settings"> + label="Environment Settings..." + name="Environment Settings"> <menu_item_call.on_click function="World.EnvSettings" parameter="editor"/> @@ -1129,6 +1179,13 @@ name="Help" tear_off="true"> <menu_item_call + label="How to..." + name="How To"> + <menu_item_call.on_click + function="Help.ToggleHowTo" + parameter="" /> + </menu_item_call> + <menu_item_call label="[SECOND_LIFE] Help" name="Second Life Help" shortcut="F1"> @@ -1136,14 +1193,6 @@ function="ShowHelp" parameter="f1_help" /> </menu_item_call> - <menu_item_check - label="Enable Hints" - name="Enable Hints"> - <on_check - control="EnableUIHints"/> - <on_click - function="ToggleUIHints"/> - </menu_item_check> <!-- <menu_item_call label="Tutorial" name="Tutorial"> @@ -1664,7 +1713,17 @@ function="ToggleControl" parameter="MouseSmooth" /> </menu_item_check> - + <menu_item_call + enabled="false" + label="Release Keys" + name="Release Keys"> + <menu_item_call.on_click + function="Tools.ReleaseKeys" + parameter="" /> + <menu_item_call.on_enable + function="Tools.EnableReleaseKeys" + parameter="" /> + </menu_item_call> <menu_item_separator/> <menu @@ -1694,23 +1753,7 @@ function="Floater.Toggle" parameter="search" /> </menu_item_check> - <menu_item_call - enabled="false" - label="Release Keys" - name="Release Keys"> - <menu_item_call.on_click - function="Tools.ReleaseKeys" - parameter="" /> - <menu_item_call.on_enable - function="Tools.EnableReleaseKeys" - parameter="" /> - </menu_item_call> - <menu_item_call - label="Set UI Size to Default" - name="Set UI Size to Default"> - <menu_item_call.on_click - function="View.DefaultUISize" /> - </menu_item_call> + <!-- This second, alternative shortcut for Show Advanced Menu is for backward compatibility. The main shortcut has been changed so it's Linux-friendly, where the old shortcut is typically eaten by the window manager. --> <menu_item_check label="Show Advanced Menu - legacy shortcut" @@ -2435,6 +2478,16 @@ function="Advanced.ToggleInfoDisplay" parameter="raycast" /> </menu_item_check> + <menu_item_check + label="Wind Vectors" + name="Wind Vectors"> + <menu_item_check.on_check + function="Advanced.CheckInfoDisplay" + parameter="wind vectors" /> + <menu_item_check.on_click + function="Advanced.ToggleInfoDisplay" + parameter="wind vectors" /> + </menu_item_check> <menu_item_check label="Render Complexity" name="rendercomplexity"> @@ -2549,19 +2602,6 @@ <menu_item_check.on_enable function="Advanced.EnableRenderDeferredOptions" /> </menu_item_check> - <menu_item_check - label=" Global Illumination (experimental)" - name="Global Illumination"> - <menu_item_check.on_check - function="CheckControl" - parameter="RenderDeferredGI" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="RenderDeferredGI" /> - <menu_item_check.on_enable - function="Advanced.EnableRenderDeferredOptions" /> - </menu_item_check> - <menu_item_separator /> <menu_item_check diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 41a90f5984..0ba4b84abe 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -2369,7 +2369,7 @@ Would you be my friend? name="RemoveFromFriends" type="alertmodal"> <tag>friendship</tag> -Do you want to remove [NAME] from your Friends List? +Do you want to remove <nolink>[NAME]</nolink> from your Friends List? <tag>confirm</tag> <usetemplate name="okcancelbuttons" @@ -2665,9 +2665,18 @@ Display settings have been set to safe levels because you have specified the -sa <notification icon="alertmodal.tga" - name="DisplaySetToRecommended" + name="DisplaySetToRecommendedGPUChange" type="alertmodal"> -Display settings have been set to recommended levels based on your system configuration. +Display settings have been set to recommended levels because your graphics card changed +from '[LAST_GPU]' +to '[THIS_GPU]' + </notification> + + <notification + icon="alertmodal.tga" + name="DisplaySetToRecommendedFeatureChange" + type="alertmodal"> +Display settings have been set to recommended levels because of a change to the rendering subsystem. </notification> <notification @@ -4624,6 +4633,34 @@ Are you sure you want to quit? <notification icon="alertmodal.tga" + name="ConfirmRestoreToybox" + type="alertmodal"> + <unique/> +This action will restore your default buttons and toolbars. + +You cannot undo this action. + <usetemplate + name="okcancelbuttons" + notext="Cancel" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" + name="ConfirmClearAllToybox" + type="alertmodal"> + <unique/> +This action will return all buttons to the toolbox and your toolbars will be empty. + +You cannot undo this action. + <usetemplate + name="okcancelbuttons" + notext="Cancel" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" name="DeleteItems" type="alertmodal"> <unique/> @@ -5124,7 +5161,7 @@ Topic: [SUBJECT], Message: [MESSAGE] name="FriendOnline" type="notifytip"> <tag>friendship</tag> -[NAME] is Online +<nolink>[NAME]</nolink> is Online </notification> <notification @@ -5132,7 +5169,7 @@ Topic: [SUBJECT], Message: [MESSAGE] name="FriendOffline" type="notifytip"> <tag>friendship</tag> -[NAME] is Offline +<nolink>[NAME]</nolink> is Offline </notification> <notification @@ -5409,21 +5446,23 @@ Your calling card was declined. </notification> <notification - icon="notifytip.tga" - name="TeleportToLandmark" - type="notifytip"> -You can teleport to locations like '[NAME]' by opening the Places panel on the right side of your screen, and then select the Landmarks tab. -Click on any landmark to select it, then click 'Teleport' at the bottom of the panel. -(You can also double-click on the landmark, or right-click it and choose 'Teleport'.) + icon="notifytip.tga" + name="TeleportToLandmark" + type="notifytip"> + To teleport to locations like '[NAME]', click on the "Places" button, + then select the Landmarks tab in the window that opens. Click on any + landmark to select it, then click 'Teleport' at the bottom of the window. + (You can also double-click on the landmark, or right-click it and + choose 'Teleport'.) </notification> <notification icon="notifytip.tga" name="TeleportToPerson" type="notifytip"> -You can contact Residents like '[NAME]' by opening the People panel on the right side of your screen. -Select the Resident from the list, then click 'IM' at the bottom of the panel. -(You can also double-click on their name in the list, or right-click and choose 'IM'). + To contact Residents like '[NAME]', click on the "People" button , select a Resident from the window that opens, then click 'IM' at the + bottom of the window. + (You can also double-click on their name in the list, or right-click and choose 'IM'). </notification> <notification @@ -6132,7 +6171,7 @@ Your object named <nolink>[OBJECTFROMNAME]</nolink> has given you th name="FriendshipAccepted" type="offer"> <tag>friendship</tag> -[NAME] accepted your friendship offer. +<nolink>[NAME]</nolink> accepted your friendship offer. </notification> <notification @@ -6141,7 +6180,7 @@ Your object named <nolink>[OBJECTFROMNAME]</nolink> has given you th persist="true" type="notify"> <tag>friendship</tag> -[NAME] declined your friendship offer. +<nolink>[NAME]</nolink> declined your friendship offer. </notification> <notification @@ -6900,7 +6939,7 @@ With the following Residents: <usetemplate name="okcancelbuttons" notext="Cancel" - yestext="Ok"/> + yestext="OK"/> </notification> <notification @@ -7096,7 +7135,7 @@ Mute everyone? <usetemplate ignoretext="Confirm before I mute all participants in a group call" name="okcancelignore" - yestext="Ok" + yestext="OK" notext="Cancel"> <unique/> </usetemplate> @@ -7383,19 +7422,6 @@ The site at '<nolink>[HOST_NAME]</nolink>' in realm ' </notification> <notification - name="ModeChange" - label="" - type="alertmodal"> - <unique/> - Changing modes requires you to quit and restart. - <tag>confirm</tag> - <usetemplate - name="okcancelbuttons" - yestext="Quit" - notext="Don't Quit"/> - </notification> - - <notification name="NoClassifieds" label="" type="alertmodal"> @@ -7549,6 +7575,20 @@ The site at '<nolink>[HOST_NAME]</nolink>' in realm ' notext="Don't Quit"/> </notification> + <notification + name="ConfirmHideUI" + label="" + type="alertmodal"> + <unique/> + <tag>confirm</tag> + This action will hide all menu items and buttons. To get them back, click [SHORTCUT] again. + <usetemplate + name="okcancelignore" + yestext="OK" + notext="Cancel" + ignoretext="Confirm before hiding UI"/> + </notification> + <global name="UnsupportedGLRequirements"> You do not appear to have the proper hardware requirements for [APP_NAME]. [APP_NAME] requires an OpenGL graphics card that has multitexture support. If this is the case, you may want to make sure that you have the latest drivers for your graphics card, and service packs and patches for your operating system. diff --git a/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml index 20ff492c0f..2a24c74feb 100644 --- a/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml +++ b/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml @@ -10,7 +10,7 @@ name="Mockup Tab" selection_enabled="true" tab_stop="false" - title="Mockup Tab" + title="MOCKUP TAB" translate="false" width="0"> <wearable_items_list diff --git a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml index e70abc0975..93cafd4a53 100644 --- a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml +++ b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml @@ -58,7 +58,7 @@ label="Call" name="call_btn" width="130" - top="5" /> + top="0" /> </layout_panel> <layout_panel auto_resize="false" @@ -75,7 +75,7 @@ height="20" label="Leave Call" name="end_call_btn" - top="5"/> + top="0"/> </layout_panel> <layout_panel auto_resize="false" @@ -92,7 +92,7 @@ height="20" label="Voice Controls" name="voice_ctrls_btn" - top="5" + top="0" use_ellipses="true" /> </layout_panel> </layout_stack> diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml deleted file mode 100644 index ec5853649e..0000000000 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ /dev/null @@ -1,530 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel - background_visible="true" - bg_alpha_color="DkGray" - bg_opaque_color="DkGray" - chrome="true" - follows="left|bottom|right" - focus_root="true" - height="33" - layout="topleft" - left="0" - name="bottom_tray" - top="28" - width="1310"> - <string - name="DragIndicationImageName" - value="Accordion_ArrowOpened_Off" /> - <string - name="SpeakBtnToolTip" - value="Turns microphone on/off" /> - <string - name="VoiceControlBtnToolTip" - value="Shows/hides voice control panel" /> - <layout_stack - border_size="0" - clip="false" - follows="all" - height="28" - layout="topleft" - left="0" - mouse_opaque="false" - name="toolbar_stack" - orientation="horizontal" - top="0" - width="1310"> - <layout_panel - auto_resize="false" - user_resize="false" - min_width="2" - width="2" /> - <layout_panel - auto_resize="false" - layout="topleft" - max_width="320" - min_width="214" - height="28" - mouse_opaque="false" - name="chat_bar_layout_panel" - user_resize="true" - width="250" > - <panel - name="chat_bar" - filename="panel_nearby_chat_bar.xml" - left="0" - height="28" - width="248" - top="0" - mouse_opaque="false" - follows="left|right" - /> - </layout_panel> - <!-- - This 5px Panel is an indicator of where the resize handle is. - The panel provides a gap between the resize handle icon and a button to the right. - --> - <layout_panel - auto_resize="false" - layout="topleft" - max_width="5" - min_width="5" - name="chat_bar_resize_handle_panel" - user_resize="false" - width="5"> - <icon - follows="top|right" - height="25" - image_name="ChatBarHandle" - layout="topleft" - left="-7" - name="resize_handle" - top="4" - width="5" /> - </layout_panel> - <layout_panel - auto_resize="false" - follows="left|right" - height="28" - layout="topleft" - min_height="28" - min_width="59" - mouse_opaque="false" - name="speak_panel" - top_delta="0" - user_resize="false" - width="108"> - <talk_button - follows="left|right" - height="23" - layout="topleft" - left="0" - name="talk" - top="5" - width="105"> - <show_button - tab_stop="true"> - <init_callback - function="Button.SetDockableFloaterToggle" - parameter="voice_controls" /> - </show_button> - <!-- do not remove halign attribute with default value. otherwise it can't be overridden in other locales. - & pad_right is default value for long label which can be right aligned. See EXT-6318 --> - <speak_button - halign="center" - label="Speak" - label_selected="Speak" - name="speak_btn" - pad_right="20" - tab_stop="true" - use_ellipses="true" /> - </talk_button> - </layout_panel> - <layout_panel - auto_resize="false" - follows="right" - height="28" - layout="topleft" - min_height="28" - min_width="65" - mouse_opaque="false" - name="gesture_panel" - top_delta="0" - user_resize="false" - width="85"> - <gesture_combo_list - follows="left|right" - height="23" - label="Gesture" - layout="topleft" - left="0" - name="Gesture" - tool_tip="Shows/hides gestures" - top="5" - width="82"> - <combo_button - pad_right="10" - use_ellipses="true" /> - <combo_list - page_lines="17" /> - </gesture_combo_list> - </layout_panel> - <layout_panel - auto_resize="false" - follows="right" - height="28" - layout="topleft" - min_height="28" - min_width="52" - mouse_opaque="false" - name="movement_panel" - user_resize="false" - width="83"> - <bottomtray_button - follows="left|right" - height="23" - image_pressed="PushButton_Press" - image_pressed_selected="PushButton_Selected_Press" - image_selected="PushButton_Selected_Press" - is_toggle="true" - label="Move" - layout="topleft" - name="movement_btn" - tool_tip="Shows/hides movement controls" - top="5" - use_ellipses="true" - width="80"> - <init_callback - function="Button.SetDockableFloaterToggle" - parameter="moveview" /> - </bottomtray_button> - - </layout_panel> - <layout_panel - auto_resize="false" - follows="left|right" - height="28" - layout="topleft" - min_height="28" - min_width="52" - mouse_opaque="false" - name="cam_panel" - user_resize="false" - width="83"> - <bottomtray_button - follows="left|right" - height="23" - image_pressed="PushButton_Press" - image_pressed_selected="PushButton_Selected_Press" - image_selected="PushButton_Selected_Press" - is_toggle="true" - label="View" - layout="topleft" - left="0" - name="camera_btn" - tool_tip="Shows/hides camera controls" - top="5" - use_ellipses="true" - width="80"> - <init_callback - function="Button.SetDockableFloaterToggle" - parameter="camera" /> - </bottomtray_button> - </layout_panel> - <layout_panel - auto_resize="false" - follows="left|right" - height="28" - layout="topleft" - min_width="40" - mouse_opaque="false" - name="snapshot_panel" - user_resize="false" - width="39"> - <bottomtray_button - follows="left|right" - height="23" - image_overlay="Snapshot_Off" - image_pressed="PushButton_Press" - image_pressed_selected="PushButton_Selected_Press" - image_selected="PushButton_Selected_Press" - is_toggle="true" - layout="topleft" - left="0" - name="snapshots" - tool_tip="Take snapshot" - top="5" - width="36"> - <init_callback - function="Button.SetFloaterToggle" - parameter="snapshot" /> - </bottomtray_button> - </layout_panel> - <layout_panel - auto_resize="false" - follows="left|right" - height="28" - layout="topleft" - min_height="28" - min_width="52" - mouse_opaque="false" - name="build_btn_panel" - user_resize="false" - width="83"> - <!--*FIX: Build Floater is not opened with default registration. Will be fixed soon. -Disabled for now. ---> - <bottomtray_button - follows="left|right" - height="23" - image_pressed="PushButton_Press" - image_pressed_selected="PushButton_Selected_Press" - image_selected="PushButton_Selected_Press" - is_toggle="true" - label="Build" - layout="topleft" - left="0" - name="build_btn" - tool_tip="Shows/hides Build Tools" - top="5" - use_ellipses="true" - width="80"> - <commit_callback - function="Build.Toggle" - parameter="build" /> - </bottomtray_button> - </layout_panel> - <layout_panel - auto_resize="false" - follows="left|right" - height="28" - layout="topleft" - min_height="28" - min_width="52" - mouse_opaque="false" - name="search_btn_panel" - user_resize="false" - width="83"> - <bottomtray_button - follows="left|right" - height="23" - image_pressed="PushButton_Press" - image_pressed_selected="PushButton_Selected_Press" - image_selected="PushButton_Selected_Press" - is_toggle="true" - label="Search" - layout="topleft" - left="0" - name="search_btn" - tool_tip="Shows/hides Search" - top="5" - use_ellipses="true" - width="80"> - <init_callback - function="Button.SetFloaterToggle" - parameter="search" /> - </bottomtray_button> - </layout_panel> - <layout_panel - auto_resize="false" - follows="left|right" - height="28" - layout="topleft" - min_height="28" - min_width="52" - mouse_opaque="false" - name="world_map_btn_panel" - user_resize="false" - width="83"> - <bottomtray_button - follows="left|right" - height="23" - image_pressed="PushButton_Press" - image_pressed_selected="PushButton_Selected_Press" - image_selected="PushButton_Selected_Press" - is_toggle="true" - label="Map" - layout="topleft" - left="0" - name="world_map_btn" - tool_tip="Shows/hides World Map" - top="5" - use_ellipses="true" - width="80"> - <init_callback - function="Button.SetFloaterToggle" - parameter="world_map" /> - </bottomtray_button> - </layout_panel> - <layout_panel - auto_resize="false" - follows="left|right" - height="28" - layout="topleft" - min_height="28" - min_width="62" - mouse_opaque="false" - name="mini_map_btn_panel" - user_resize="false" - width="83"> - <bottomtray_button - follows="left|right" - height="23" - image_pressed="PushButton_Press" - image_pressed_selected="PushButton_Selected_Press" - image_selected="PushButton_Selected_Press" - is_toggle="true" - label="Mini-Map" - layout="topleft" - left="0" - name="mini_map_btn" - tool_tip="Shows/hides Mini-Map" - top="5" - use_ellipses="true" - width="80"> - <init_callback - function="Button.SetFloaterToggle" - parameter="mini_map" /> - </bottomtray_button> - </layout_panel> - <layout_panel - follows="left|right" - height="30" - layout="topleft" - min_width="95" - mouse_opaque="false" - name="chiclet_list_panel" - top="0" - user_resize="false" - width="189"> -<!--*NOTE: min_width of the chiclet_panel (chiclet_list) must be the same -as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly. EXT-991--> - <chiclet_panel - chiclet_padding="4" - follows="left|right" - height="24" - layout="topleft" - left="1" - min_width="95" - mouse_opaque="false" - name="chiclet_list" - top="7" - width="189"> - <button - auto_resize="true" - follows="right" - height="29" - image_hover_selected="SegmentedBtn_Left_Over" - image_hover_unselected="SegmentedBtn_Left_Over" - image_overlay="Arrow_Small_Left" - image_pressed="SegmentedBtn_Left_Press" - image_pressed_selected="SegmentedBtn_Left_Press" - image_selected="SegmentedBtn_Left_Off" - image_unselected="SegmentedBtn_Left_Off" - layout="topleft" - name="chicklet_left_scroll_button" - tab_stop="false" - top="-28" - visible="false" - width="7" /> - <button - auto_resize="true" - follows="right" - height="29" - image_hover_selected="SegmentedBtn_Right_Over" - image_hover_unselected="SegmentedBtn_Right_Over" - image_overlay="Arrow_Small_Right" - image_pressed="SegmentedBtn_Right_Press" - image_pressed_selected="SegmentedBtn_Right_Press" - image_selected="SegmentedBtn_Right_Off" - image_unselected="SegmentedBtn_Right_Off" - layout="topleft" - name="chicklet_right_scroll_button" - tab_stop="false" - top="-28" - visible="false" - width="7" /> - </chiclet_panel> - </layout_panel> - <layout_panel auto_resize="false" - user_resize="false" - width="4" - min_width="4"/> - <layout_panel - auto_resize="false" - follows="right" - height="28" - layout="topleft" - min_height="28" - min_width="37" - name="im_well_panel" - top="0" - user_resize="false" - width="37"> - <chiclet_im_well - follows="right" - height="28" - layout="topleft" - left="0" - max_displayed_count="99" - name="im_well" - top="0" - width="35"> - <!-- -Emulate 4 states of button by background images, see details in EXT-3147. The same should be for notification_well button -xml attribute Description -image_unselected "Unlit" - there are no new messages -image_selected "Unlit" + "Selected" - there are no new messages and the Well is open -image_pressed "Lit" - there are new messages -image_pressed_selected "Lit" + "Selected" - there are new messages and the Well is open - --> - <button - auto_resize="true" - follows="right" - halign="center" - height="23" - image_overlay="Unread_IM" - image_overlay_alignment="center" - image_pressed="WellButton_Lit" - image_pressed_selected="WellButton_Lit_Selected" - image_selected="PushButton_Press" - label_color="Black" - left="0" - name="Unread IM messages" - tool_tip="Conversations" - width="34"> - <init_callback - function="Button.SetDockableFloaterToggle" - parameter="im_well_window" /> - </button> - </chiclet_im_well> - </layout_panel> - <layout_panel - auto_resize="false" - follows="right" - height="28" - layout="topleft" - min_height="28" - min_width="37" - name="notification_well_panel" - top="0" - user_resize="false" - width="37"> - <chiclet_notification - follows="right" - height="23" - layout="topleft" - left="0" - max_displayed_count="99" - name="notification_well" - top="5" - width="35"> - <button - auto_resize="true" - bottom_pad="3" - follows="right" - halign="center" - height="23" - image_overlay="Notices_Unread" - image_overlay_alignment="center" - image_pressed="WellButton_Lit" - image_pressed_selected="WellButton_Lit_Selected" - image_selected="PushButton_Press" - label_color="Black" - left="0" - name="Unread" - tool_tip="Notifications" - width="34"> - <init_callback - function="Button.SetDockableFloaterToggle" - parameter="notification_well_window" /> - </button> - </chiclet_notification> - </layout_panel> - <layout_panel - auto_resize="false" - user_resize="false" - min_width="4" - name="DUMMY2" - width="8" /> - </layout_stack> -</panel> diff --git a/indra/newview/skins/default/xui/en/panel_chat_item.xml b/indra/newview/skins/default/xui/en/panel_chat_item.xml index 34c6e02684..6af1105400 100644 --- a/indra/newview/skins/default/xui/en/panel_chat_item.xml +++ b/indra/newview/skins/default/xui/en/panel_chat_item.xml @@ -2,7 +2,7 @@ <!-- All our XML is utf-8 encoded. --> <panel name="instant_message" - width="315" + width="300" height="180" follows="all"> <avatar_icon @@ -22,6 +22,7 @@ text_color="white" word_wrap="true" mouse_opaque="true" + valign="bottom" name="msg_text"> </text_chat> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml new file mode 100644 index 0000000000..41d1036a4d --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml @@ -0,0 +1,176 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + background_visible="false" + chrome="true" + follows="left|top|right" + height="30" + layout="topleft" + mouse_opaque="false" + name="chiclet_bar" + width="1310"> + <layout_stack + border_size="0" + clip="false" + follows="all" + height="30" + layout="topleft" + left="0" + mouse_opaque="false" + name="toolbar_stack" + orientation="horizontal" + top="0" + width="1310"> + <layout_panel + follows="left|right" + height="30" + layout="topleft" + min_width="95" + mouse_opaque="false" + name="chiclet_list_panel" + top="0" + user_resize="false" + width="189"> + <chiclet_panel + chiclet_padding="4" + follows="left|right" + height="24" + layout="topleft" + left="1" + min_width="95" + mouse_opaque="false" + name="chiclet_list" + top="7" + width="189"> + <button + auto_resize="false" + follows="right" + height="29" + image_hover_selected="SegmentedBtn_Left_Over" + image_hover_unselected="SegmentedBtn_Left_Over" + image_overlay="Arrow_Small_Left" + image_pressed="SegmentedBtn_Left_Press" + image_pressed_selected="SegmentedBtn_Left_Press" + image_selected="SegmentedBtn_Left_Off" + image_unselected="SegmentedBtn_Left_Off" + layout="topleft" + name="chicklet_left_scroll_button" + tab_stop="false" + top="-28" + visible="false" + width="12" /> + <button + auto_resize="false" + follows="right" + height="29" + image_hover_selected="SegmentedBtn_Right_Over" + image_hover_unselected="SegmentedBtn_Right_Over" + image_overlay="Arrow_Small_Right" + image_pressed="SegmentedBtn_Right_Press" + image_pressed_selected="SegmentedBtn_Right_Press" + image_selected="SegmentedBtn_Right_Off" + image_unselected="SegmentedBtn_Right_Off" + layout="topleft" + name="chicklet_right_scroll_button" + tab_stop="false" + top="-28" + visible="false" + width="12" /> + </chiclet_panel> + </layout_panel> + <layout_panel auto_resize="false" + user_resize="false" + width="4" + min_width="4"/> + <layout_panel + auto_resize="false" + follows="right" + height="28" + layout="topleft" + min_height="28" + min_width="37" + name="im_well_panel" + top="0" + user_resize="false" + width="37"> + <chiclet_im_well + follows="right" + height="28" + layout="topleft" + left="0" + max_displayed_count="99" + name="im_well" + top="0" + width="35"> + <!-- +Emulate 4 states of button by background images, see details in EXT-3147. The same should be for notification_well button +xml attribute Description +image_unselected "Unlit" - there are no new messages +image_selected "Unlit" + "Selected" - there are no new messages and the Well is open +image_pressed "Lit" - there are new messages +image_pressed_selected "Lit" + "Selected" - there are new messages and the Well is open + --> + <button + auto_resize="false" + follows="right" + halign="center" + height="23" + image_overlay="Unread_IM" + image_overlay_alignment="center" + image_pressed="WellButton_Lit" + image_pressed_selected="WellButton_Lit_Selected" + image_selected="PushButton_Press" + label_color="Black" + left="0" + name="Unread IM messages" + tool_tip="Conversations" + width="34"> + <init_callback + function="Button.SetDockableFloaterToggle" + parameter="im_well_window" /> + </button> + </chiclet_im_well> + </layout_panel> + <layout_panel + auto_resize="false" + follows="right" + height="28" + layout="topleft" + min_height="28" + min_width="37" + name="notification_well_panel" + top="0" + user_resize="false" + width="37"> + <chiclet_notification + follows="right" + height="23" + layout="topleft" + left="0" + max_displayed_count="99" + name="notification_well" + top="5" + width="35"> + <button + auto_resize="false" + bottom_pad="3" + follows="right" + halign="center" + height="23" + image_overlay="Notices_Unread" + image_overlay_alignment="center" + image_pressed="WellButton_Lit" + image_pressed_selected="WellButton_Lit_Selected" + image_selected="PushButton_Press" + label_color="Black" + left="0" + name="Unread" + tool_tip="Notifications" + width="34"> + <init_callback + function="Button.SetDockableFloaterToggle" + parameter="notification_well_window" /> + </button> + </chiclet_notification> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_edit_jacket.xml b/indra/newview/skins/default/xui/en/panel_edit_jacket.xml index 8e8d8e6505..0f8c37c691 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_jacket.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_jacket.xml @@ -32,7 +32,7 @@ name="Upper Fabric" tool_tip="Click to choose a picture" top="10" - width="74" > + width="75" > <texture_picker.commit_callback function="TexturePicker.Commit" /> </texture_picker> 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 eff674c628..d4da55e32e 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 @@ -272,6 +272,7 @@ top="0" width="313"> <text_editor + font="Monospace" enabled="false" type="string" follows="all" diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index 1c3e08d59b..6521bf2a4e 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -22,17 +22,17 @@ top="600" <!-- *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="980" /> + 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="980"/> <layout_stack follows="left|bottom|right" name="login_widgets" @@ -120,33 +120,6 @@ label="Remember password" follows="left|bottom" font="SansSerifSmall" height="15" - left_pad="10" - name="mode_selection_text" - top="20" - width="130"> - Mode: - </text> - <combo_box - follows="left|bottom" - height="23" - max_chars="128" - tool_tip="Select your mode. Choose Basic for fast, easy exploration and chat. Choose Advanced to access more features." - top_pad="0" - name="mode_combo" - width="110"> - <combo_box.item - label="Basic" - name="Basic" - value="settings_minimal.xml" /> - <combo_box.item - label="Advanced" - name="Advanced" - value="" /> - </combo_box> - <text - follows="left|bottom" - font="SansSerifSmall" - height="15" left_pad="8" name="start_location_text" top="20" diff --git a/indra/newview/skins/default/xui/en/panel_me.xml b/indra/newview/skins/default/xui/en/panel_me.xml index 84b5d11ba7..23e7814cad 100644 --- a/indra/newview/skins/default/xui/en/panel_me.xml +++ b/indra/newview/skins/default/xui/en/panel_me.xml @@ -10,43 +10,10 @@ name="panel_me" top="0" width="333"> - <!--<text - type="string" - follows="top|left|right" - font="SansSerifHugeBold" - height="20" - layout="topleft" - left="15" - name="user_name" - text_color="white" - top="0" - mouse_opaque="true" - width="280"> - (Loading...) - </text> --> - <tab_container - follows="all" - height="555" - halign="center" - layout="topleft" - left="5" - name="tabs" - tab_min_width="95" - tab_height="30" - tab_position="top" - top_pad="10" - width="317"> - <panel - class="panel_my_profile" - filename="panel_my_profile.xml" - label="MY PROFILE" - help_topic="panel_my_profile_tab" - name="panel_profile" /> - <panel - class="panel_picks" - filename="panel_picks.xml" - label="MY PICKS" - help_topic="panel_my_picks_tab" - name="panel_picks" /> - </tab_container> + <panel + class="panel_picks" + filename="panel_picks.xml" + label="MY PICKS" + help_topic="panel_my_picks_tab" + name="panel_picks"/> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml deleted file mode 100644 index 4bd2235cda..0000000000 --- a/indra/newview/skins/default/xui/en/panel_my_profile.xml +++ /dev/null @@ -1,146 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel - follows="all" - height="535" - label="Profile" - layout="topleft" - left="0" - name="panel_profile" - top="0" - width="315"> - <string - name="CaptionTextAcctInfo"> - [ACCTTYPE] -[PAYMENTINFO] [AGEVERIFICATION] - </string> - <string - name="payment_update_link_url"> - http://www.secondlife.com/account/billing.php?lang=en - </string> - <string - name="partner_edit_link_url"> - http://www.secondlife.com/account/partners.php?lang=en - </string> - <string - name="my_account_link_url" - value="http://secondlife.com/account" /> - <string - name="no_partner_text" - value="None" /> - <string - name="no_group_text" - value="None" /> - <string - name="RegisterDateFormat"> - [REG_DATE] ([AGE]) - </string> - <string - name="name_text_args"> - [NAME] - </string> - <string - name="display_name_text_args"> - [DISPLAY_NAME] - </string> - <layout_stack - name="layout" - orientation="vertical" - follows="all" - layout="topleft" - left="0" - top="0" - height="510" - width="315" - border_size="0"> - <layout_panel - name="profile_stack" - follows="all" - layout="topleft" - top="0" - left="0" - height="492" - user_resize="false" - width="315"> - <scroll_container - color="DkGray2" - follows="all" - layout="topleft" - left="0" - name="profile_scroll" - opaque="true" - height="488" - width="315" - top="0"> - <panel - layout="topleft" - follows="left|top|right" - height="488" - name="scroll_content_panel" - top="0" - left="0" - width="297"> - <panel - follows="left|top|right" - height="117" - layout="topleft" - left="10" - name="second_life_image_panel" - top="0" - width="297"> - - <texture_picker - allow_no_texture="true" - default_image_name="None" - enabled="false" - fallback_image="Generic_Person_Large" - follows="top|left" - height="124" - layout="topleft" - left="3" - name="2nd_life_pic" - top="10" - width="102" /> - - <text - follows="left|top|right" - font="SansSerifLarge" - font.style="BOLD" - height="15" - layout="topleft" - left_pad="10" - name="display_name_descr_text" - text_color="0.7 0.7 0.7 1.0" - top_delta="0" - width="280" > - User name - </text> - - <text - follows="left|top|right" - font.style="BOLD" - height="15" - layout="topleft" - left_delta="0" - name="name_descr_text" - text_color="0.4 0.4 0.4 1.0" - top_delta="20" - width="280"> - Display Name - </text> - - <button - follows="bottom" - height="23" - left_delta="0" - top_delta="20" - label="Profile" - name="see_profile_btn" - tool_tip="See profile for this avatar" - width="120" /> - - </panel> - </panel> - </scroll_container> - </layout_panel> - </layout_stack> -</panel> 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 51ffec4727..7a8e872dc9 100644 --- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml @@ -5,21 +5,21 @@ bg_opaque_color="MouseGray" follows="left|top|right" focus_root="true" - height="60" + height="34" layout="topleft" name="navigation_bar" chrome="true" - width="600"> + width="800"> <icon follows="all" image_name="NavBar_BG" mouse_opaque="false" name="bg_icon" scale_image="true" - visible="true" + visible="false" left="0" top="0" - height="60" + height="34" width="600"/> <icon follows="all" @@ -30,7 +30,7 @@ visible="false" left="0" top="0" - height="60" + height="34" width="600"/> <icon follows="all" @@ -41,16 +41,47 @@ visible="false" left="0" top="0" - height="60" + height="34" width="600"/> + <icon + follows="all" + image_name="NavBar Separator" + mouse_opaque="false" + name="separator_image" + scale_image="true" + left="0" + top="0" + width="800" + height="2"/> + <layout_stack + use_border="true" + bevel_style="none" + follows="all" + height="34" + layout="topleft" + left="0" + mouse_opaque="false" + name="nvp_stack" + orientation="horizontal" + top="0" + width="800"> + <layout_panel + follows="top|left" + layout="topleft" + auto_resize="true" + user_resize="true" + min_width="480" + name="navigation_layout_panel" + width="480"> <panel background_visible="false" follows="left|top|right" top="3" height="23" layout="topleft" + left="0" name="navigation_panel" - width="600"> + width="480"> <pull_button follows="left|top" direction="down" @@ -87,7 +118,7 @@ top_delta="0" width="32" /> <location_input - follows="left|right|top" + follows="all" halign="right" height="23" label="Location" @@ -97,70 +128,50 @@ mouse_opaque="false" name="location_combo" top_delta="0" - width="226"> + width="355"> <combo_list mouse_wheel_opaque="true"/> - <!-- *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" --> - <!-- top_delta="0" --> - <!-- width="168" /> --> - <search_combo_box - follows="right|top" - halign="right" - height="23" - label="Search" + </panel> + </layout_panel> + + <layout_panel + auto_resize="false" + layout="topleft" + max_width="5" + min_width="5" + name="nav_bar_resize_handle_panel" + user_resize="false" + width="5"> + <icon + follows="top|right" + height="25" + image_name="ChatBarHandle" + layout="topleft" + left="-6" + name="resize_handle" + top="4" + width="5" /> + </layout_panel> + + <layout_panel + follows="top|left" layout="topleft" - right="-10" - mouse_opaque="false" - name="search_combo_box" - tool_tip="Search" - top_delta="0" - width="244" > - <combo_editor - label="Search [SECOND_LIFE]" - name="search_combo_editor"/> - <combo_list - draw_border="true" - border.highlight_light_color="FocusColor" - border.highlight_dark_color="FocusColor" - border.shadow_light_color="FocusColor" - border.shadow_dark_color="FocusColor" - mouse_wheel_opaque="true" /> - </search_combo_box> - </panel> + auto_resize="true" + user_resize="true" + min_width="315" + name="favorites_layout_panel" + width="315"> <favorites_bar follows="left|right|top" font="SansSerifSmall" - height="15" + height="20" layout="topleft" left="0" name="favorite" image_drag_indication="Accordion_ArrowOpened_Off" - bottom="55" tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!" - width="590"> + width="311"> <label follows="left|top" height="15" @@ -173,14 +184,20 @@ width="102"> Favorites Bar </label> - <chevron_button name=">>" - image_unselected="TabIcon_Close_Off" - image_selected="TabIcon_Close_Off" - tab_stop="false" - follows="left|bottom" - tool_tip="Show more of My Favorites" - width="15" - top="15" - height="15"/> + <!-- More button actually is a text box. --> + <more_button + follows="left|bottom" + name=">>" + tab_stop="false" + tool_tip="Show more of My Favorites" + top="13" + width="50" + bottom="0" + valign="bottom"> + More ▼ + </more_button> </favorites_bar> + </layout_panel> + + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat.xml index ab966dbb0e..d492f9bd68 100644 --- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_nearby_chat.xml @@ -1,32 +1,17 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater - border_visible="false" - border="false" - legacy_header_height="18" - can_minimize="true" - can_tear_off="false" - can_resize="true" - can_drag_on_left="false" - can_close="false" - can_dock="true" - bevel_style="in" +<panel height="300" - min_width="235" + follows="all" layout="topleft" name="nearby_chat" help_topic="nearby_chat" - save_rect="true" - title="NEARBY CHAT" - save_dock_state="true" - save_visibility="true" - single_instance="true" width="320"> <check_box bottom_delta="36" control_name="TranslateChat" enabled="true" height="16" - label="Translate chat (powered by Google)" + label="Translate chat" layout="topleft" left="5" name="translate_chat_checkbox" @@ -47,4 +32,4 @@ right_widget_pad="5" left_widget_pad="0" width="315" /> -</floater> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_notes.xml b/indra/newview/skins/default/xui/en/panel_notes.xml deleted file mode 100644 index 124b1cfc6b..0000000000 --- a/indra/newview/skins/default/xui/en/panel_notes.xml +++ /dev/null @@ -1,236 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel - follows="all" - height="515" - label="Notes & Privacy" - layout="topleft" - left="0" - name="panel_notes" - top="0" - width="313" -> - <layout_stack - name="layout" - orientation="vertical" - follows="all" - layout="topleft" - left="0" - top="0" - height="517" - width="313" - border_size="0"> - <layout_panel - name="notes_stack" - follows="all" - layout="topleft" - top="0" - left="0" - height="450" - width="313"> - <scroll_container - color="DkGray2" - follows="all" - layout="topleft" - left="0" - name="profile_scroll" - opaque="true" - height="450" - width="313" - top="0"> - <panel - height="450" - layout="topleft" - name="profile_scroll_panel" - top="0" - left="0" - width="303"> - <text - follows="left|top" - font.style="BOLD" - height="16" - layout="topleft" - left="11" - name="status_message" - text_color="white" - top="10" - value="My private notes:" - width="293" /> - <text_editor - follows="left|top" - height="120" - layout="topleft" - left="12" - max_length="1000" - name="notes_edit" - text_color="DkGray" - top_pad="3" - width="288" - word_wrap="true" /> - <text - follows="left|top" - font.style="BOLD" - height="16" - layout="topleft" - left="11" - name="status_message2" - text_color="white" - top_pad="20" - value="Allow this person to:" - width="293" /> - <check_box - enabled="false" - height="16" - label="See my online status" - layout="topleft" - left="10" - name="status_check" - width="293" /> - <check_box - enabled="false" - height="16" - label="See me on the map" - layout="topleft" - left="10" - name="map_check" - width="293" /> - <check_box - enabled="false" - height="16" - label="Edit, delete or take my objects" - layout="topleft" - left="10" - name="objects_check" - width="293" /> - </panel> - </scroll_container> - </layout_panel> - <layout_panel - follows="bottom|left" - height="30" - layout="topleft" - left="0" - name="notes_buttons_panel" - auto_resize="false" - width="313"> - - <layout_stack - follows="bottom|left|right" - height="23" - layout="topleft" - name="bottom_bar_ls" - left="2" - orientation="horizontal" - top_pad="5" - width="309"> - - <layout_panel - follows="bottom|left|right" - height="23" - layout="bottomleft" - left="0" - name="add_friend_btn_lp" - user_resize="false" - auto_resize="true" - width="118"> - <button - follows="bottom|left|right" - height="23" - label="Add Friend" - layout="topleft" - left="1" - mouse_opaque="false" - name="add_friend" - tool_tip="Offer friendship to the Resident" - top="0" - width="117" /> - </layout_panel> - - <layout_panel - follows="bottom|left|right" - height="23" - layout="bottomleft" - left_pad="3" - name="im_btn_lp" - user_resize="false" - auto_resize="true" - width="22"> - <button - follows="bottom|left|right" - height="23" - label="IM" - layout="topleft" - name="im" - tool_tip="Open instant message session" - top="0" - left="1" - width="21" /> - </layout_panel> - - <layout_panel - follows="bottom|left|right" - height="23" - layout="bottomleft" - left_pad="3" - name="call_btn_lp" - user_resize="false" - auto_resize="true" - width="52"> - <button - follows="bottom|left|right" - height="23" - label="Call" - layout="topleft" - name="call" - tool_tip="Call this Resident" - left="1" - top="0" - use_ellipses="true" - width="51" /> - </layout_panel> - - <layout_panel - follows="bottom|left|right" - height="23" - layout="bottomleft" - left_pad="3" - name="show_on_map_btn_lp" - user_resize="false" - auto_resize="true" - width="46"> - <button - enabled="false" - follows="bottom|left|right" - height="23" - label="Map" - layout="topleft" - name="show_on_map_btn" - tool_tip="Show the Resident on the map" - top="0" - left="1" - width="45" /> - </layout_panel> - - <layout_panel - follows="bottom|left|right" - height="23" - layout="bottomleft" - left_pad="3" - name="teleport_btn_lp" - user_resize="false" - auto_resize="true" - width="81"> - <button - follows="bottom|left|right" - height="23" - label="Teleport" - layout="topleft" - name="teleport" - tool_tip="Offer teleport" - left="1" - top="0" - width="80" /> - </layout_panel> - </layout_stack> - </layout_panel> - </layout_stack> -</panel> diff --git a/indra/newview/skins/default/xui/en/panel_notification.xml b/indra/newview/skins/default/xui/en/panel_notification.xml index 59ead84127..f6f62ac54e 100644 --- a/indra/newview/skins/default/xui/en/panel_notification.xml +++ b/indra/newview/skins/default/xui/en/panel_notification.xml @@ -9,6 +9,8 @@ layout="topleft" left="0" name="notification_panel" + chrome="true" + show_title="false" top="0" height="140" translate="false" 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 7daa52b2d9..24046d5cca 100644 --- a/indra/newview/skins/default/xui/en/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml @@ -117,7 +117,7 @@ </scroll_container> <panel follows="left|right|bottom" - height="35" + height="23" layout="topleft" top_pad="5" left="8" diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml index 87e263726d..85f402dfa2 100644 --- a/indra/newview/skins/default/xui/en/panel_picks.xml +++ b/indra/newview/skins/default/xui/en/panel_picks.xml @@ -4,12 +4,12 @@ bg_opaque_color="DkGray2" background_visible="true" background_opaque="true" follows="all" - height="548" + height="571" label="Picks" layout="topleft" - left="0" + left="8" name="panel_picks" - top="0" + top_pad="0" width="313"> <string name="no_picks" @@ -30,7 +30,7 @@ bg_opaque_color="DkGray2" <accordion fit_parent="true" follows="all" - height="485" + height="514" layout="topleft" left="0" name="accordion" @@ -81,10 +81,10 @@ bg_opaque_color="DkGray2" left="1" height="27" label="bottom_panel" - layout="bottom" + layout="topleft" name="edit_panel" - top_pad="-2" - width="313"> + top_pad="0" + width="312"> <layout_stack follows="bottom|left|right" @@ -149,8 +149,9 @@ bg_opaque_color="DkGray2" follows="bottom|left|right" layout="topleft" left="0" - height="40" + height="30" name="buttons_cucks" + top_pad="0" width="313"> <layout_stack diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml index 5d7334f780..670aa47313 100644 --- a/indra/newview/skins/default/xui/en/panel_places.xml +++ b/indra/newview/skins/default/xui/en/panel_places.xml @@ -202,7 +202,7 @@ background_visible="true" </layout_panel> <layout_panel - follows="bottom|left|right" + follows="bottom|right" height="23" layout="bottomleft" left_pad="0" @@ -212,7 +212,7 @@ background_visible="true" auto_resize="true" width="24"> <menu_button - follows="bottom|left|right" + follows="bottom|right" height="23" image_disabled="ComboButton_UpOff" image_unselected="ComboButton_UpOff" diff --git a/indra/newview/skins/default/xui/en/floater_postcard.xml b/indra/newview/skins/default/xui/en/panel_postcard_message.xml index c756661ffc..ab2a42ea01 100644 --- a/indra/newview/skins/default/xui/en/floater_postcard.xml +++ b/indra/newview/skins/default/xui/en/panel_postcard_message.xml @@ -1,132 +1,101 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater - legacy_header_height="18" - auto_tile="true" - can_minimize="false" - can_resize="true" +<panel height="380" layout="topleft" - min_height="380" - min_width="490" - name="Postcard" - help_topic="postcard" - title="EMAIL SNAPSHOT" + name="panel_postcard_message" width="490"> - <floater.string - name="default_subject"> - Postcard from [SECOND_LIFE]. - </floater.string> - <floater.string - name="default_message"> - Check this out! - </floater.string> - <floater.string - name="upload_message"> - Sending... - </floater.string> <text type="string" length="1" bottom="35" follows="top|left" font="SansSerif" + height="16" layout="topleft" left="12" - name="to_label"> - Recipient's Email: + name="to_label" + top="10" + width="60"> + To: </text> <line_editor control_name="LastPostcardRecipient" - follows="left|top" + follows="left|top|right" height="20" layout="topleft" - left_delta="148" + left_pad="10" name="to_form" - top_delta="-4" - width="150" /> - <text - type="string" - length="1" - bottom_delta="23" - follows="top|left" - font="SansSerif" - layout="topleft" - left="12" - name="from_label"> - Your Email: - </text> - <line_editor - follows="left|top" - height="20" - layout="topleft" - left_delta="148" - name="from_form" - top_delta="-4" - width="150" /> + right="-10" + top_delta="-4" /> <text type="string" length="1" bottom_delta="23" follows="top|left" font="SansSerif" + height="16" layout="topleft" left="12" - name="name_label"> - Your Name: + name="name_label" + width="60"> + From: </text> <line_editor - follows="left|top" + follows="left|top|right" height="20" layout="topleft" - left_delta="148" + left_pad="10" max_length_bytes="100" name="name_form" - top_delta="-4" - width="150" /> + right="-10" + top_delta="-4" /> <text type="string" length="1" bottom_delta="23" follows="top|left" font="SansSerif" + height="16" layout="topleft" left="12" - name="subject_label"> + name="subject_label" + width="60"> Subject: </text> <line_editor - follows="left|top" + follows="left|top|right" height="20" label="Type your subject here." layout="topleft" - left_delta="148" + left_pad="10" max_length_bytes="100" name="subject_form" - top_delta="-4" - width="150" /> + right="-10" + top_delta="-4" /> <text type="string" length="1" bottom_delta="23" - follows="top|left" + follows="top|left|right" font="SansSerif" layout="topleft" left="12" - name="msg_label"> + name="msg_label" + right="-10"> Message: </text> <text_editor type="string" length="1" - follows="left|top|right|bottom" - height="140" + follows="left|top|right" + height="60" layout="topleft" left_delta="0" max_length="700" name="msg_form" - word_wrap="true" + right="-10" top_pad="10" - width="420"> + word_wrap="true"> Type your message here. </text_editor> <button @@ -135,9 +104,12 @@ label="Cancel" layout="topleft" name="cancel_btn" - right="-10" + right="-32" top="350" - width="100" /> + width="100"> + <button.commit_callback + function="Postcard.Cancel" /> + </button> <button follows="right|bottom" height="23" @@ -146,5 +118,8 @@ left_delta="-106" name="send_btn" top_delta="0" - width="100" /> -</floater> + width="100"> + <button.commit_callback + function="Postcard.Send" /> + </button> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_postcard_settings.xml b/indra/newview/skins/default/xui/en/panel_postcard_settings.xml new file mode 100644 index 0000000000..2e0bb88f53 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_postcard_settings.xml @@ -0,0 +1,137 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + height="380" + layout="topleft" + name="panel_postcard_settings" + width="490"> + <combo_box + follows="left|top|right" + height="23" + label="Resolution" + layout="topleft" + left="10" + name="postcard_size_combo" + right="-10" + top_pad="10"> + <combo_box.item + label="Current Window" + name="CurrentWindow" + value="[i0,i0]" /> + <combo_box.item + label="640x480" + name="640x480" + value="[i640,i480]" /> + <combo_box.item + label="800x600" + name="800x600" + value="[i800,i600]" /> + <combo_box.item + label="1024x768" + name="1024x768" + value="[i1024,i768]" /> + <combo_box.item + label="Custom" + name="Custom" + value="[i-1,i-1]" /> + </combo_box> + <layout_stack + animate="false" + follows="all" + height="275" + layout="bottomleft" + name="postcard_image_params_ls" + left_delta="0" + orientation="vertical" + top_pad="10" + right="-10"> + <layout_panel + follows="top|left|right" + height="60" + layout="topleft" + left="0" + name="postcard_image_size_lp" + user_resize="false" + auto_resize="false" + top="0" + right="-1" + visible="true"> + <spinner + allow_text_entry="false" + decimal_digits="0" + follows="left|top" + height="20" + increment="32" + label="Width" + label_width="40" + layout="topleft" + left="10" + max_val="6016" + min_val="32" + name="postcard_snapshot_width" + top_pad="10" + width="95" /> + <spinner + allow_text_entry="false" + decimal_digits="0" + follows="left|top" + height="20" + increment="32" + label="Height" + label_width="40" + layout="topleft" + left_pad="5" + max_val="6016" + min_val="32" + name="postcard_snapshot_height" + top_delta="0" + width="95" /> + <check_box + bottom_delta="20" + follows="left|top" + label="Constrain proportions" + layout="topleft" + left="10" + name="postcard_keep_aspect_check" /> + </layout_panel> + <layout_panel + follows="top|left|right" + height="23" + layout="topleft" + left="0" + name="postcard_image_format_quality_lp" + user_resize="false" + auto_resize="true" + top="0" + right="-1" + visible="true"> + <slider + decimal_digits="0" + follows="left|top" + height="15" + increment="1" + initial_value="75" + label="Image quality" + label_width="80" + layout="topleft" + left="0" + max_val="100" + name="image_quality_slider" + top_pad="7" + width="190" /> + <text + type="string" + follows="left|top" + font="SansSerifSmall" + length="1" + height="14" + layout="topleft" + left_pad="-5" + halign="left" + name="image_quality_level" + top_delta="0" + width="60"> + ([QLVL]) + </text> + </layout_panel> + </layout_stack> +</panel> 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 ea09286592..caf7fc85f5 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml @@ -204,119 +204,16 @@ name="nearby_toasts_fadingtime" top_pad="3" width="325" /> - - <check_box - control_name="TranslateChat" - enabled="true" - height="16" - layout="topleft" - left="30" - name="translate_chat_checkbox" - top_pad="5" - width="400" /> - <!-- *HACK - After storm-1109 will be fixed: instead of using this text_box, word_wrap should be applied for "translate_chat_checkbox" check_box's label.--> - <text - follows="top|left" - height="15" - layout="topleft" - left="50" - name="translate_chb_label" - top_delta="1" - width="450" - wrap="true"> - Use machine translation while chatting (powered by Google) - </text> - <text - top_pad="20" - name="translate_language_text" - follows="left|top" - layout="topleft" - left_delta="20" - height="20" - width="110"> - Translate chat into: - </text> - <combo_box - allow_text_entry="true" - bottom_delta="3" - control_name="TranslateLanguage" - enabled="true" - follows="left|top" - height="23" - left_delta="110" - max_chars="135" - mouse_opaque="true" - name="translate_language_combobox" - width="146"> - <combo_box.item - label="System Default" - name="System Default Language" - value="default" /> - <combo_box.item - label="English" - name="English" - value="en" /> - <!-- After "System Default" and "English", please keep the rest of these combo_box.items in alphabetical order by the first character in the string. --> - <combo_box.item - label="Dansk (Danish)" - name="Danish" - value="da" /> - <combo_box.item - label="Deutsch (German)" - name="German" - value="de" /> - <combo_box.item - label="Español (Spanish)" - name="Spanish" - value="es" /> - <combo_box.item - label="Français (French)" - name="French" - value="fr" /> - <combo_box.item - label="Italiano (Italian)" - name="Italian" - value="it" /> - <combo_box.item - label="Magyar (Hungarian)" - name="Hungarian" - value="hu" /> - <combo_box.item - label="Nederlands (Dutch)" - name="Dutch" - value="nl" /> - <combo_box.item - label="Polski (Polish)" - name="Polish" - value="pl" /> - <combo_box.item - label="Português (Portuguese)" - name="Portugese" - value="pt" /> - <combo_box.item - label="Русский (Russian)" - name="Russian" - value="ru" /> - <combo_box.item - label="Türkçe (Turkish)" - name="Turkish" - value="tr" /> - <combo_box.item - label="Українська (Ukrainian)" - name="Ukrainian" - value="uk" /> - <combo_box.item - label="中文 (简体) (Chinese)" - name="Chinese" - value="zh" /> - <combo_box.item - label="日本語 (Japanese)" - name="Japanese" - value="ja" /> - <combo_box.item - label="한국어 (Korean)" - name="Korean" - value="ko" /> - </combo_box> + <button + follows="left|top" + height="23" + label="Chat Translation Settings" + layout="topleft" + left="30" + name="ok_btn" + top="-40" + width="170"> + <button.commit_callback + function="Pref.TranslationSettings" /> + </button> </panel>
\ No newline at end of file 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 9c718fdb87..4079a80924 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml @@ -67,11 +67,6 @@ value="it" /> <combo_box.item enabled="true" - label="Nederlands (Dutch) - Beta" - name="Dutch" - value="nl" /> - <combo_box.item - enabled="true" label="Polski (Polish) - Beta" name="Polish" value="pl" /> @@ -82,9 +77,24 @@ value="pt" /> <combo_box.item enabled="true" + label="Русский (Russian) - Beta" + name="Russian" + value="ru" /> + <combo_box.item + enabled="true" + label="Türkçe (Turkish) - Beta" + name="Turkish" + value="tr" /> + <combo_box.item + enabled="true" label="日本語 (Japanese) - Beta" name="(Japanese)" value="ja" /> + <combo_box.item + enabled="true" + label="正體中文 (Traditional Chinese) - Beta" + name="Traditional Chinese" + value="zh" /> </combo_box> <text font="SansSerifSmall" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml index cb547d7c6b..d9067b41c7 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml @@ -86,16 +86,6 @@ name="appearance_camera_movement" tool_tip="Use automatic camera positioning while in edit mode" width="242" /> - <check_box - control_name="SidebarCameraMovement" - follows="left|top" - height="16" - initial_value="true" - label="Sidebar" - layout="topleft" - name="appearance_sidebar_positioning" - tool_tip="Use automatic camera positioning for sidebar" - width="242" /> <icon follows="left|top" height="18" @@ -117,7 +107,7 @@ name="keyboard_lbl" width="270" top_delta="2"> - Keyboard: + Keyboard: </text> <check_box control_name="ArrowKeysAlwaysMove" @@ -149,7 +139,7 @@ name="mouse_lbl" width="270" top_pad="15"> - Mouse: + Mouse: </text> <check_box control_name="FirstPersonAvatarVisible" @@ -205,7 +195,7 @@ name="single_click_action_lbl" width="150" top_pad="20"> - Single click on land: + Single click on land: </text> <combo_box height="23" @@ -235,7 +225,7 @@ name="double_click_action_lbl" width="150" top_pad="12"> - Double click on land: + Double click on land: </text> <combo_box height="23" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml index a7078ce2e1..4aeea8823e 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml @@ -122,7 +122,7 @@ layout="topleft" left_delta="0" name="external" - value="1" + value="true" top="0" tool_tip="Use the default system web browser for help, web links, etc. Not recommended if running full screen." width="480" /> diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml deleted file mode 100644 index f5a9daa994..0000000000 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ /dev/null @@ -1,458 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel - follows="all" - height="430" - label="Profile" - layout="topleft" - left="0" - name="panel_profile" - top="0" - width="317"> - <string - name="CaptionTextAcctInfo"> - [ACCTTYPE] -[PAYMENTINFO] [AGEVERIFICATION] - </string> - <string - name="payment_update_link_url"> - http://www.secondlife.com/account/billing.php?lang=en - </string> - <string - name="partner_edit_link_url"> - http://www.secondlife.com/account/partners.php?lang=en - </string> - <string - name="my_account_link_url" - value="http://secondlife.com/account" /> - <string - name="no_partner_text" - value="None" /> - <string - name="no_group_text" - value="None" /> - <string - name="RegisterDateFormat"> - [REG_DATE] ([AGE]) - </string> - <string - name="name_text_args"> - [NAME] - </string> - <string - name="display_name_text_args"> - [DISPLAY_NAME] - </string> - <layout_stack - name="layout" - orientation="vertical" - follows="all" - layout="topleft" - left="0" - top="0" - height="400" - width="317" - border_size="0"> - <layout_panel - name="profile_stack" - follows="all" - layout="topleft" - top="0" - left="0" - height="400" - width="317"> - <scroll_container - color="DkGray2" - follows="all" - layout="topleft" - left="0" - name="profile_scroll" - opaque="true" - height="400" - width="317" - top="0"> - <panel - layout="topleft" - follows="left|top|right" - height="505" - min_height="505" - name="profile_scroll_panel" - top="0" - left="0" - width="297"> - <panel - follows="left|top|right" - height="124" - layout="topleft" - left="13" - name="second_life_image_panel" - top="0" - width="297"> - <texture_picker - allow_no_texture="true" - default_image_name="None" - enabled="false" - fallback_image="Generic_Person_Large" - follows="top|left" - height="124" - layout="topleft" - left="0" - name="2nd_life_pic" - top="10" - width="102" /> - <text - follows="left|top|right" - font.style="BOLD" - height="15" - layout="topleft" - left_pad="10" - name="title_sl_descr_text" - text_color="white" - top_delta="0" - value="[SECOND_LIFE]:" - width="180" /> - <expandable_text - follows="left|top|right" - height="97" - layout="topleft" - left="107" - textbox.max_length="512" - textbox.show_context_menu="true" - name="sl_description_edit" - top_pad="-3" - translate="false" - width="180" - expanded_bg_visible="true" - expanded_bg_color="DkGray"> - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet.Nullamma lesuada mauris sit amet ipsum. adipiscing elit. Ae nean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. - </expandable_text> - </panel> - <panel - follows="left|top|right" - height="124" - layout="topleft" - top_pad="0" - left="13" - name="first_life_image_panel" - width="297"> - <texture_picker - allow_no_texture="true" - default_image_name="None" - enabled="false" - fallback_image="Generic_Person_Large" - follows="top|left" - height="124" - layout="topleft" - left="0" - name="real_world_pic" - width="102" /> - <text - follows="left|top|right" - font.style="BOLD" - height="15" - layout="topleft" - left_pad="10" - name="title_rw_descr_text" - text_color="white" - top_delta="0" - value="Real World:" - width="180" /> - <expandable_text - follows="left|top|right" - height="97" - layout="topleft" - left="107" - textbox.max_length="512" - textbox.show_context_menu="true" - name="fl_description_edit" - top_pad="-3" - translate="false" - width="180" - expanded_bg_visible="true" - expanded_bg_color="DkGray"> - Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. - </expandable_text> - </panel> - <text - follows="left|top" - height="15" - font.style="BOLD" - font="SansSerifMedium" - layout="topleft" - left="10" - name="homepage_edit" - top_pad="0" - translate="false" - value="http://librarianavengers.org" - width="300" - word_wrap="false" - use_ellipses="true" /> - <text - follows="left|top" - font.style="BOLD" - height="10" - layout="topleft" - left="10" - name="title_member_text" - text_color="white" - top_pad="10" - value="Resident Since:" - width="300" /> - <text_editor - allow_scroll="false" - bg_visible="false" - follows="left|top" - h_pad="0" - height="15" - layout="topleft" - left="10" - name="register_date" - read_only="true" - translate="false" - v_pad="0" - value="05/31/2376" - width="300" - word_wrap="true" /> - <text - follows="left|top" - font.style="BOLD" - height="15" - layout="topleft" - left="10" - name="title_acc_status_text" - text_color="white" - top_pad="5" - value="Account Status:" - width="300" /> - <!-- <text - type="string" - follows="left|top" - font="SansSerifSmall" - height="15" - layout="topleft" - left_pad="10" - name="my_account_link" - top_delta="0" - value="Go to Dashboard" - width="100"/> --> - <text_editor - allow_scroll="false" - bg_visible="false" - follows="left|top" - h_pad="0" - height="28" - layout="topleft" - left="10" - name="acc_status_text" - read_only="true" - top_pad="0" - translate="false" - v_pad="0" - width="300" - word_wrap="true"> - Resident. No payment info on file. - Linden. - </text_editor> - <text - follows="left|top" - font.style="BOLD" - height="15" - layout="topleft" - left="10" - name="title_partner_text" - text_color="white" - top_pad="3" - value="Partner:" - width="300" /> - <panel - follows="left|top" - height="15" - layout="topleft" - left="10" - name="partner_data_panel" - top_pad="0" - width="300"> - <text - follows="left|top" - height="10" - initial_value="(retrieving)" - layout="topleft" - left="0" - parse_urls="true" - name="partner_text" - top="0" - use_ellipses="true" - width="300" /> - </panel> - <text - follows="left|top" - font.style="BOLD" - height="13" - layout="topleft" - left="10" - name="title_groups_text" - text_color="white" - top_pad="3" - value="Groups:" - width="300" /> - <expandable_text - follows="all" - height="103" - layout="topleft" - left="7" - name="sl_groups" - textbox.max_length="512" - textbox.show_context_menu="true" - top_pad="0" - translate="false" - width="290" - expanded_bg_visible="true" - expanded_bg_color="DkGray"> - Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. Aenean viverra tulip moosetop. Slan de heelish marfnik tooplod. Sum sum to whop de wompam booster copm. - </expandable_text> - </panel> - </scroll_container> - </layout_panel> - -</layout_stack> - - <layout_stack - name="layout_verb_buttons" - orientation="horizontal" - follows="bottom|left|right" - layout="topleft" - left="2" - top_pad="1" - height="30" - width="315" - border_size="0"> - <layout_panel - follows="bottom|left" - height="30" - layout="topleft" - name="profile_buttons_panel" - top="0" - auto_resize="false" - width="317"> - - <layout_stack - follows="bottom|left|right" - height="23" - layout="topleft" - name="bottom_bar_ls" - left="0" - orientation="horizontal" - top_pad="5" - width="317"> - - <layout_panel - follows="bottom|left|right" - height="23" - layout="bottomleft" - left="0" - name="add_friend_btn_lp" - user_resize="false" - auto_resize="true" - width="121"> - <button - follows="bottom|left|right" - height="23" - label="Add Friend" - layout="topleft" - left="1" - mouse_opaque="false" - name="add_friend" - tool_tip="Offer friendship to the Resident" - top="0" - width="120" /> - </layout_panel> - - <layout_panel - follows="bottom|left|right" - height="23" - layout="bottomleft" - left_pad="3" - name="im_btn_lp" - user_resize="false" - auto_resize="true" - width="22"> - <button - follows="bottom|left|right" - height="23" - label="IM" - layout="topleft" - name="im" - tool_tip="Open instant message session" - top="0" - left="1" - width="21" /> - </layout_panel> - - <layout_panel - follows="bottom|left|right" - height="23" - layout="bottomleft" - left_pad="3" - name="call_btn_lp" - user_resize="false" - auto_resize="true" - width="52"> - <button - follows="bottom|left|right" - height="23" - label="Call" - layout="topleft" - name="call" - tool_tip="Call this Resident" - left="1" - top="0" - use_ellipses="true" - width="51" /> - </layout_panel> - - <layout_panel - follows="bottom|left|right" - height="23" - layout="bottomleft" - left_pad="3" - name="chat_btn_lp" - user_resize="false" - auto_resize="true" - width="93"> - <button - follows="bottom|left|right" - height="23" - label="Teleport" - layout="topleft" - name="teleport" - tool_tip="Offer teleport" - left="1" - top="0" - use_ellipses="true" - width="92" /> - </layout_panel> - - <layout_panel - follows="bottom|left|right" - height="23" - layout="bottomleft" - left_pad="3" - name="overflow_btn_lp" - user_resize="false" - auto_resize="false" - width="24"> - <menu_button - follows="bottom|left|right" - height="23" - label="▼" - layout="topleft" - name="overflow_btn" - tool_tip="Pay money to or share inventory with the Resident" - left="1" - top="0" - width="23" /> - </layout_panel> - </layout_stack> - </layout_panel> - </layout_stack> - -</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 deleted file mode 100644 index 646875b52e..0000000000 --- a/indra/newview/skins/default/xui/en/panel_profile_view.xml +++ /dev/null @@ -1,162 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel - background_visible="true" - follows="all" - height="570" - layout="topleft" - min_height="350" - name="panel_target_profile" - left="0" - width="333"> - <string - name="status_online"> - Online - </string> - <string - name="status_offline"> - Offline - </string> - <button - follows="top|left" - height="24" - image_hover_unselected="BackButton_Over" - image_pressed="BackButton_Press" - image_unselected="BackButton_Off" - layout="topleft" - name="back" - left="10" - tab_stop="false" - top="2" - width="30" - use_draw_context_alpha="false" /> - <text - top="10" - follows="top|left" - height="13" - layout="topleft" - left="45" - name="display_name_label" - text_color="LtGray" - value="Display Name:" - width="80" /> - <text - top_delta="0" - follows="top|left" - height="13" - layout="topleft" - left="45" - name="solo_username_label" - text_color="LtGray" - value="Username:" - visible="false" - width="80" /> - <text - follows="top|right" - halign="right" - height="13" - layout="topleft" - right="-15" - name="status" - text_color="LtGray_50" - top_delta="0" - value="Online" - width="150" /> - <text - follows="top|left|right" - font="SansSerifBigBold" - height="29" - layout="topleft" - left="45" - name="user_name_small" - text_color="LtGray" - top="22" - value="Jack oh look at me this is a super duper long name" - use_ellipses="true" - word_wrap="true" - visible="false" - width="255" /> - <text - follows="top|left|right" - font="SansSerifHugeBold" - height="27" - layout="topleft" - left="45" - name="user_name" - text_color="LtGray" - translate="false" - top="25" - value="TestString PleaseIgnore" - visible="true" - use_ellipses="true" - width="258" /> - <button - name="copy_to_clipboard" - layout="topleft" - follows="top|right" - image_overlay="Copy" - top_delta="0" - right="-15" - height="21" - width="21" - tab_stop="false" - tool_tip="Copy to Clipboard"/> - <text - follows="top|left" - height="13" - layout="topleft" - left="45" - name="user_label" - text_color="LtGray" - top_pad="10" - value="Username:" - width="70" /> - <text - follows="top|left" - height="20" - layout="topleft" - left_pad="0" - name="user_slid" - text_color="EmphasisColor" - font="SansSerifBold" - top_delta="-2" - translate="false" - use_ellipses="true" - value="teststring.pleaseignore" - width="195" - wrap="true "/> - <tab_container - follows="all" - height="489" - halign="center" - layout="topleft" - left="5" - min_width="333" - name="tabs" - tab_min_width="80" - tab_height="30" - tab_position="top" - top_pad="5" - width="317"> - <panel - class="panel_profile" - filename="panel_profile.xml" - label="PROFILE" - layout="topleft" - help_topic="profile_profile_tab" - name="panel_profile" /> - <panel - class="panel_picks" - filename="panel_picks.xml" - label="PICKS" - layout="topleft" - help_topic="profile_picks_tab" - name="panel_picks" /> - <panel - class="panel_notes" - filename="panel_notes.xml" - label="NOTES & PRIVACY" - layout="topleft" - help_topic="profile_notes_tab" - name="panel_notes" /> - </tab_container> -</panel> diff --git a/indra/newview/skins/default/xui/en/panel_region_covenant.xml b/indra/newview/skins/default/xui/en/panel_region_covenant.xml index df16f6fd37..112f12500d 100644 --- a/indra/newview/skins/default/xui/en/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/en/panel_region_covenant.xml @@ -57,7 +57,7 @@ mouse_opaque="false" name="estate_name_text" top_delta="0" - width="150"> + width="350"> mainland </text> <text @@ -79,7 +79,7 @@ mouse_opaque="false" name="estate_owner_text" top_delta="0" - width="150"> + width="350"> (none) </text> <text diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml deleted file mode 100644 index 0f330a7b98..0000000000 --- a/indra/newview/skins/default/xui/en/panel_side_tray.xml +++ /dev/null @@ -1,174 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<!-- Side tray cannot show background because it is always - partially on screen to hold tab buttons. --> -<side_tray - name="sidebar" - background_visible="false" - mouse_opaque="true" - width="333" - collapsed="true" -> - <!-- Individual tabs must show background to have seemless - appearance up to tray panel header word like "Home". - Embedded panels are inset by a pixel and so their - backgrounds will not block the world fully. --> - - <sidetray_tab - name="sidebar_openclose" - help_topic="sidebar_openclose" - tab_title="Toggle Sidebar" - description="Toggle Sidebar." - image="TabIcon_Open_Off" - image_selected="TabIcon_Close_Off" - mouse_opaque="false" - background_visible="true" - > - <panel /> <!-- dummy panel, never to actually be seen --> - </sidetray_tab> - - <sidetray_tab - name="sidebar_home" - help_topic="sidebar_home" - tab_title="Home" - description="Home." - image="TabIcon_Home_Off" - image_selected="TabIcon_Home_Selected" - mouse_opaque="false" - background_visible="true" - > - <panel - class="panel_sidetray_home" - name="panel_home" - filename="panel_sidetray_home_tab.xml" - label="home" - /> - </sidetray_tab> - - <sidetray_tab - name="sidebar_me" - help_topic="sidebar_me" - tab_title="My Profile" - description="Edit your public profile and Picks." - image="TabIcon_Me_Off" - image_selected="TabIcon_Me_Selected" - mouse_opaque="false" - background_visible="true" - > - <panel_container - name="panel_container" - default_panel_name="panel_me" - width="333" - > - <panel - class="panel_me" - name="panel_me" - filename="panel_me.xml" - label="Me" - /> - - </panel_container> - </sidetray_tab> - - <sidetray_tab - name="sidebar_people" - help_topic="sidebar_people" - tab_title="People" - description="Find your friends, contacts and people nearby." - image="TabIcon_People_Off" - image_selected="TabIcon_People_Selected" - mouse_opaque="false" - background_visible="true" - > - <panel_container - name="panel_container" - default_panel_name="panel_people" - width="333" - > - <panel - class="panel_people" - name="panel_people" - filename="panel_people.xml" - /> - <panel - class="panel_profile_view" - name="panel_profile_view" - filename="panel_profile_view.xml" - /> - <panel - class="panel_group_info_sidetray" - name="panel_group_info_sidetray" - filename="panel_group_info_sidetray.xml" - label="Group Profile" - font="SansSerifBold" - /> - <panel - class="panel_block_list_sidetray" - name="panel_block_list_sidetray" - filename="panel_block_list_sidetray.xml" - label="Blocked Residents & Objects" - font="SansSerifBold" - /> - - </panel_container> - </sidetray_tab> - - <sidetray_tab - name="sidebar_places" - help_topic="sidebar_places" - tab_title="Places" - label="Places" - description="Find places to go and places you've visited before." - image="TabIcon_Places_Off" - image_selected="TabIcon_Places_Selected" - mouse_opaque="false" - background_visible="true" - > - <panel - class="panel_places" - name="panel_places" - filename="panel_places.xml" - label="Places" - font="SansSerifBold" - /> - </sidetray_tab> - - <sidetray_tab - name="sidebar_inventory" - help_topic="sidebar_inventory" - tab_title="My Inventory" - description="Browse your inventory." - image="TabIcon_Things_Off" - image_selected="TabIcon_Things_Selected" - mouse_opaque="false" - background_visible="true" - > - <badge location="top_left" location_percent_vcenter="50" location_percent_hcenter="95" /> - <panel - class="sidepanel_inventory" - name="sidepanel_inventory" - filename="sidepanel_inventory.xml" - label="Edit Inventory" - font="SansSerifBold" - /> - </sidetray_tab> - - <sidetray_tab - name="sidebar_appearance" - help_topic="sidebar_appearance" - tab_title="My Appearance" - description="Change your appearance and current look." - image="TabIcon_Appearance_Off" - image_selected="TabIcon_Appearance_Selected" - mouse_opaque="false" - background_visible="true" - > - <panel - class="sidepanel_appearance" - name="sidepanel_appearance" - filename="sidepanel_appearance.xml" - label="Edit Appearance" - font="SansSerifBold" - /> - </sidetray_tab> - -</side_tray> diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml new file mode 100644 index 0000000000..9057ebb65e --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml @@ -0,0 +1,147 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + height="380" + layout="topleft" + name="panel_snapshot_inventory" + width="490"> + <icon + follows="top|left" + height="18" + image_name="Snapshot_Inventory" + layout="topleft" + left="12" + mouse_opaque="true" + name="title_icon" + top="5" + width="18" /> + <text + follows="top|left|right" + font="SansSerifBold" + height="20" + layout="topleft" + left_pad="12" + length="1" + name="title" + right="-10" + text_color="white" + type="string" + top_delta="5"> + Save to My Inventory + </text> + <view_border + bevel_style="in" + follows="left|top|right" + height="1" + left="10" + layout="topleft" + name="hr" + right="-10" + top_pad="5" + /> + <text + bottom="35" + follows="top|left|right" + font="SansSerif" + height="56" + layout="topleft" + left="12" + length="1" + name="hint_lbl" + top_pad="10" + 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. + </text> + <combo_box + follows="top|left|right" + height="23" + label="Resolution" + layout="topleft" + left_delta="0" + name="texture_size_combo" + right="-10" + top_pad="10"> + <combo_box.item + label="Current Window" + name="CurrentWindow" + value="[i0,i0]" /> + <combo_box.item + label="Small (128x128)" + name="Small(128x128)" + value="[i128,i128]" /> + <combo_box.item + label="Medium (256x256)" + name="Medium(256x256)" + value="[i256,i256]" /> + <combo_box.item + label="Large (512x512)" + name="Large(512x512)" + value="[i512,i512]" /> + <combo_box.item + label="Custom" + name="Custom" + value="[i-1,i-1]" /> + </combo_box> + <spinner + allow_text_entry="false" + decimal_digits="0" + follows="left|top" + height="20" + increment="32" + label="Width" + label_width="40" + layout="topleft" + left="10" + max_val="6016" + min_val="32" + name="inventory_snapshot_width" + top_pad="10" + width="95" /> + <spinner + allow_text_entry="false" + decimal_digits="0" + follows="left|top" + height="20" + increment="32" + label="Height" + label_width="40" + layout="topleft" + left_pad="5" + max_val="6016" + min_val="32" + name="inventory_snapshot_height" + top_delta="0" + width="95" /> + <check_box + bottom_delta="20" + follows="left|top" + label="Constrain proportions" + layout="topleft" + left="10" + name="inventory_keep_aspect_check" + visible="false" /> + <button + follows="right|bottom" + height="23" + label="Cancel" + layout="topleft" + name="cancel_btn" + right="-32" + top="350" + width="100"> + <button.commit_callback + function="Inventory.Cancel" /> + </button> + <button + follows="right|bottom" + height="23" + label="Save" + layout="topleft" + left_delta="-106" + name="save_btn" + top_delta="0" + width="100"> + <button.commit_callback + function="Inventory.Save" /> + </button> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_local.xml b/indra/newview/skins/default/xui/en/panel_snapshot_local.xml new file mode 100644 index 0000000000..ae0215a578 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_snapshot_local.xml @@ -0,0 +1,236 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + height="380" + layout="topleft" + name="panel_snapshot_local" + width="490"> + <icon + follows="top|left" + height="18" + image_name="Snapshot_Download" + layout="topleft" + left="12" + mouse_opaque="true" + name="title_icon" + top="5" + width="18" /> + <text + follows="top|left|right" + font="SansSerifBold" + height="20" + layout="topleft" + left_pad="12" + length="1" + name="title" + right="-10" + text_color="white" + type="string" + top_delta="4"> + Save to My Computer + </text> + <view_border + bevel_style="in" + follows="left|top|right" + height="1" + left="10" + layout="topleft" + name="hr" + right="-10" + top_pad="5" + /> + <combo_box + follows="left|top|right" + height="23" + label="Resolution" + layout="topleft" + left_delta="0" + name="local_size_combo" + right="-10" + top_pad="10"> + <combo_box.item + label="Current Window" + name="CurrentWindow" + value="[i0,i0]" /> + <combo_box.item + label="320x240" + name="320x240" + value="[i320,i240]" /> + <combo_box.item + label="640x480" + name="640x480" + value="[i640,i480]" /> + <combo_box.item + label="800x600" + name="800x600" + value="[i800,i600]" /> + <combo_box.item + label="1024x768" + name="1024x768" + value="[i1024,i768]" /> + <combo_box.item + label="1280x1024" + name="1280x1024" + value="[i1280,i1024]" /> + <combo_box.item + label="1600x1200" + name="1600x1200" + value="[i1600,i1200]" /> + <combo_box.item + label="Custom" + name="Custom" + value="[i-1,i-1]" /> + </combo_box> + <layout_stack + animate="false" + follows="all" + height="275" + layout="bottomleft" + name="local_image_params_ls" + left_delta="0" + orientation="vertical" + top_pad="10" + right="-10"> + <layout_panel + follows="top|left|right" + height="60" + layout="topleft" + left="0" + name="local_image_size_lp" + user_resize="false" + auto_resize="false" + top="0" + right="-1" + visible="true"> + <spinner + allow_text_entry="false" + decimal_digits="0" + follows="left|top" + height="20" + increment="32" + label="Width" + label_width="40" + layout="topleft" + left="10" + max_val="6016" + min_val="32" + name="local_snapshot_width" + top_pad="10" + width="95" /> + <spinner + allow_text_entry="false" + decimal_digits="0" + follows="left|top" + height="20" + increment="32" + label="Height" + label_width="40" + layout="topleft" + left_pad="5" + max_val="6016" + min_val="32" + name="local_snapshot_height" + top_delta="0" + width="95" /> + <check_box + bottom_delta="20" + follows="left|top" + label="Constrain proportions" + layout="topleft" + left="10" + name="local_keep_aspect_check" /> + </layout_panel> + <layout_panel + follows="top|left|right" + height="23" + layout="topleft" + left="0" + name="local_image_format_quality_lp" + user_resize="false" + auto_resize="true" + top="0" + right="-1" + visible="true"> + <combo_box + follows="left|top" + height="23" + label="Format" + layout="topleft" + left_delta="0" + name="local_format_combo" + top_pad="0" + width="120"> + <combo_box.item + label="PNG (Lossless)" + name="PNG" + value="PNG" /> + <combo_box.item + label="JPEG" + name="JPEG" + value="JPEG" /> + <combo_box.item + label="BMP (Lossless)" + name="BMP" + value="BMP" /> + </combo_box> + <slider + decimal_digits="0" + follows="left|top" + height="15" + increment="1" + initial_value="75" + label="Image quality" + label_width="80" + layout="topleft" + left="10" + max_val="100" + name="image_quality_slider" + top_pad="7" + width="200" /> + <text + type="string" + follows="left|top" + font="SansSerifSmall" + length="1" + height="14" + layout="topleft" + left_pad="-5" + halign="left" + name="image_quality_level" + top_delta="0" + width="60"> + ([QLVL]) + </text> + </layout_panel> + </layout_stack> + <button + follows="right|bottom" + height="23" + label="Cancel" + layout="topleft" + name="cancel_btn" + right="-32" + top="350" + width="100"> + <button.commit_callback + function="Local.Cancel" /> + </button> + <flyout_button + follows="right|bottom" + height="23" + label="Save" + layout="topleft" + left_delta="-106" + name="save_btn" + tool_tip="Save image to a file" + top_delta="0" + width="100"> + <flyout_button.item + label="Save" + name="save_item" + value="save" /> + <flyout_button.item + label="Save As..." + name="saveas_item" + value="save as" /> + </flyout_button> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml new file mode 100644 index 0000000000..d2f29ade44 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml @@ -0,0 +1,84 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + follows="all" + height="240" + layout="topleft" + name="panel_snapshot_options" + width="490"> + <button + follows="left|top|right" + font="SansSerif" + halign="left" + height="38" + image_overlay="Snapshot_Profile" + image_overlay_alignment="left" + image_top_pad="-2" + imgoverlay_label_space="10" + label="Post to My Profile Feed" + layout="topleft" + left="10" + name="save_to_profile_btn" + pad_left="10" + right="-10" + top="5"> + <button.commit_callback + function="Snapshot.SaveToProfile" /> + </button> + <button + follows="left|top|right" + font="SansSerif" + halign="left" + height="38" + image_overlay="Snapshot_Email" + image_overlay_alignment="left" + image_top_pad="-2" + imgoverlay_label_space="10" + label="Email" + layout="topleft" + left_delta="0" + name="save_to_email_btn" + pad_left="10" + right="-10" + top_pad="10"> + <button.commit_callback + function="Snapshot.SaveToEmail" /> + </button> + <button + follows="left|top|right" + font="SansSerif" + halign="left" + height="38" + image_overlay="Snapshot_Inventory" + image_overlay_alignment="left" + image_top_pad="-2" + imgoverlay_label_space="10" + label="Save to My Inventory (L$[AMOUNT])" + layout="topleft" + left_delta="0" + name="save_to_inventory_btn" + pad_left="10" + right="-10" + top_pad="10"> + <button.commit_callback + function="Snapshot.SaveToInventory" /> + </button> + <button + follows="left|top|right" + font="SansSerif" + halign="left" + height="38" + image_overlay="Snapshot_Download" + image_overlay_alignment="left" + image_top_pad="-2" + imgoverlay_label_space="10" + label="Save to My Computer" + layout="topleft" + left_delta="0" + name="save_to_computer_btn" + pad_left="10" + right="-10" + top_pad="10"> + <button.commit_callback + function="Snapshot.SaveToComputer" /> + </button> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml new file mode 100644 index 0000000000..d8ff043444 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml @@ -0,0 +1,107 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + height="380" + layout="topleft" + name="panel_snapshot_postcard" + width="490"> + <string + name="default_subject"> + Postcard from [SECOND_LIFE]. + </string> + <string + name="default_message"> + Check this out! + </string> + <string + name="upload_message"> + Sending... + </string> + <string + name="default_subject"> + Postcard from [SECOND_LIFE]. + </string> + <string + name="default_message"> + Check this out! + </string> + <icon + follows="top|left" + height="18" + image_name="Snapshot_Email" + layout="topleft" + left="12" + mouse_opaque="true" + name="title_icon" + top="5" + width="18" /> + <text + follows="top|left|right" + font="SansSerifBold" + height="20" + layout="topleft" + left_pad="12" + length="1" + name="title" + right="-10" + text_color="white" + type="string" + top_delta="3"> + Email + </text> + <button + follows="right|top" + height="23" + is_toggle="true" + label="Message" + layout="topleft" + name="message_btn" + right="-82" + top_delta="-7" + width="70"> + <button.commit_callback + function="Postcard.Message" /> + </button> + <button + follows="right|top" + height="23" + is_toggle="true" + label="Settings" + layout="topleft" + name="settings_btn" + top_delta="0" + right="-10" + width="70"> + <button.commit_callback + function="Postcard.Settings" /> + </button> + <view_border + bevel_style="in" + follows="left|top|right" + height="1" + left="10" + layout="topleft" + name="hr" + right="-10" + top_pad="5" + /> + <panel_container + follows="all" + height="340" + layout="topleft" + left="0" + name="postcard_panel_container" + default_panel_name="panel_postcard_message" + top_pad="10" + width="490"> + <panel + follows="all" + layout="topleft" + name="panel_postcard_message" + filename="panel_postcard_message.xml" /> + <panel + follows="all" + layout="topleft" + name="panel_postcard_settings" + filename="panel_postcard_settings.xml" /> + </panel_container> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml new file mode 100644 index 0000000000..91ac9ad658 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml @@ -0,0 +1,200 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + height="380" + layout="topleft" + name="panel_snapshot_profile" + width="490"> + <icon + follows="top|left" + height="18" + image_name="Snapshot_Profile" + layout="topleft" + left="12" + mouse_opaque="true" + name="title_icon" + top="5" + width="18" /> + <text + follows="top|left|right" + font="SansSerifBold" + height="20" + layout="topleft" + left_pad="12" + length="1" + name="title" + right="-10" + text_color="white" + type="string" + top_delta="4"> + Post to My Profile Feed + </text> + <view_border + bevel_style="in" + follows="left|top|right" + height="1" + left="10" + layout="topleft" + name="hr" + right="-10" + top_pad="5" + /> + <combo_box + follows="left|top" + height="23" + label="Resolution" + layout="topleft" + left_delta="0" + name="profile_size_combo" + top_pad="10" + width="250"> + <combo_box.item + label="Current Window" + name="CurrentWindow" + value="[i0,i0]" /> + <combo_box.item + label="640x480" + name="640x480" + value="[i640,i480]" /> + <combo_box.item + label="800x600" + name="800x600" + value="[i800,i600]" /> + <combo_box.item + label="1024x768" + name="1024x768" + value="[i1024,i768]" /> + <combo_box.item + label="Custom" + name="Custom" + value="[i-1,i-1]" /> + </combo_box> + <layout_stack + animate="false" + follows="all" + height="270" + layout="bottomleft" + name="profile_image_params_ls" + left_delta="0" + orientation="vertical" + top_pad="10" + right="-10"> + <layout_panel + follows="top|left|right" + height="55" + layout="topleft" + left="0" + name="profile_image_size_lp" + user_resize="false" + auto_resize="false" + top="0" + right="-1" + visible="true"> + <spinner + allow_text_entry="false" + decimal_digits="0" + follows="left|top" + height="20" + increment="32" + label="Width" + label_width="40" + layout="topleft" + left="10" + max_val="6016" + min_val="32" + name="profile_snapshot_width" + top_pad="10" + width="95" /> + <spinner + allow_text_entry="false" + decimal_digits="0" + follows="left|top" + height="20" + increment="32" + label="Height" + label_width="40" + layout="topleft" + left_pad="5" + max_val="6016" + min_val="32" + name="profile_snapshot_height" + top_delta="0" + width="95" /> + <check_box + bottom_delta="20" + label="Constrain proportions" + layout="topleft" + left="10" + name="profile_keep_aspect_check" /> + </layout_panel> + <layout_panel + follows="top|left|right" + height="200" + layout="topleft" + left="0" + name="profile_image_metadata_lp" + user_resize="false" + auto_resize="true" + top="0" + right="-1" + visible="true"> + <text + length="1" + follows="top|left|right" + font="SansSerif" + height="16" + layout="topleft" + left="0" + name="caption_label" + right="-10" + top_pad="0" + type="string"> + Caption: + </text> + <text_editor + follows="all" + height="155" + layout="topleft" + left_delta="0" + length="1" + max_length="700" + name="caption" + right="-10" + top_pad="5" + type="string" + word_wrap="true"> + </text_editor> + <check_box + follows="left|bottom" + initial_value="true" + label="Include location" + layout="topleft" + left_delta="0" + name="add_location_cb" + top_pad="15" /> + </layout_panel> + </layout_stack> + <button + follows="right|bottom" + height="23" + label="Cancel" + layout="topleft" + name="cancel_btn" + right="-32" + top="350" + width="100"> + <button.commit_callback + function="PostToProfile.Cancel" /> + </button> + <button + follows="right|bottom" + height="23" + label="Post" + layout="topleft" + left_delta="-106" + name="post_btn" + top_delta="0" + width="100"> + <button.commit_callback + function="PostToProfile.Send" /> + </button> +</panel> 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 5894abd03b..3239c4e531 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -2,7 +2,7 @@ <panel background_opaque="true" background_visible="true" - bg_opaque_color="MouseGray" + bg_opaque_color="DkGray" chrome="true" follows="top|right" height="19" @@ -35,14 +35,11 @@ </panel.string> <panel height="18" - left="-355" - width="95" + left="-370" + width="160" top="1" follows="right|top" - name="balance_bg" - bg_visible="true" - background_opaque="true" - bg_opaque_image="bevel_background"> + name="balance_bg"> <text halign="center" font="SansSerifSmall" @@ -60,11 +57,11 @@ halign="center" font="SansSerifSmall" follows="right|top|bottom" - image_hover_unselected="buy_over" - image_unselected="buy_off" - image_pressed="buy_press" + image_hover_unselected="PushButton_Over" + image_unselected="PushButton_Off" + image_pressed="PushButton_Press" height="18" - label="BUY L$" + label="Buy L$" label_color="White" left_pad="0" label_shadow="true" @@ -74,39 +71,41 @@ tool_tip="Click to buy more L$" top="0" width="55" /> + <button + halign="left" + font="SansSerifSmall" + follows="right|top|bottom" + imgoverlay_label_space="7" + image_overlay="Command_MiniCart_Icon" + image_overlay_alignment="left" + image_hover_unselected="PushButton_Over" + image_unselected="PushButton_Off" + image_pressed="PushButton_Press" + height="18" + label="Shop" + label_color="White" + left_pad="0" + label_shadow="true" + name="goShop" + pad_right="0" + pad_bottom="2" + tool_tip="Open Second Life Marketplace" + top="0" + width="65" /> </panel> - <combo_box - follows="right|top" - drop_down_button.pad_left="10" - left_pad="5" - top="0" - width="120" - height="20" - name="mode_combo" - tool_tip="Select your mode. Choose Basic for fast, easy exploration and chat. Choose Advanced to access more features." - > - <combo_box.item - label="Basic Mode" - name="Basic" - value="settings_minimal.xml" /> - <combo_box.item - label="Advanced Mode" - name="Advanced" - value="" /> - </combo_box> <text - left_pad="5" type="string" font="SansSerifSmall" text_readonly_color="TimeTextColor" follows="right|top" - halign="center" + halign="right" height="16" top="5" layout="topleft" + left_pad="0" name="TimeText" tool_tip="Current time (Pacific)" - width="75"> + width="145"> 24:00 AM PST </text> <button @@ -117,7 +116,7 @@ image_pressed="Pause_Press" image_pressed_selected="Play_Press" is_toggle="true" - left_pad="10" + left_pad="15" top="1" name="media_toggle_btn" tool_tip="Start/Stop All Media (Music, Video, Web pages)" diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml index 42f64c3a76..062c403a26 100644 --- a/indra/newview/skins/default/xui/en/panel_toast.xml +++ b/indra/newview/skins/default/xui/en/panel_toast.xml @@ -10,6 +10,7 @@ --> <floater + open_positioning="none" legacy_header_height="0" header_height="0" name="toast" @@ -20,7 +21,6 @@ width="310" left="0" top="0" - follows="right|bottom" background_visible="false" bg_opaque_image="Toast_Over" bg_alpha_image="Toast_Background" diff --git a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml new file mode 100644 index 0000000000..3c69a0cb6c --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml @@ -0,0 +1,164 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<toolbar_view + follows="all" + layout="topleft" + name="toolbar view" + height="500" + width="1024" + left="0" + top="0" + mouse_opaque="false" + tab_stop="false" + visible="true"> + <layout_stack name="bottom_toolbar_stack" + orientation="vertical" + left="0" + top="0" + width="1024" + height="500" + follows="all" + mouse_opaque="false"> + <layout_panel name="vertical_toolbar_panel" + auto_resize="true" + user_resize="false" + width="1024" + height="500" + mouse_opaque="false"> + <layout_stack name="vertical_toolbar_stack" + orientation="horizontal" + left="0" + top="0" + width="1024" + height="500" + follows="all" + mouse_opaque="false"> + <layout_panel name="left_toolbar_panel" + auto_resize="false" + user_resize="false" + height="500" + width="30" + mouse_opaque="false"> + <toolbar follows="left|top|bottom" + button_panel.bg_opaque_image="Rounded_Rect_Right" + name="toolbar_left" + width="30" + left="0" + top="10" + bottom="-10" + side="left" + button_display_mode="icons_only"> + <icon layout="topleft" + height="15" + width="28" + follows="left|top" + top="20" + left="10" + tab_stop="false" + visible="false" + image_name="Caret_Left_Icon" + name="caret" /> + </toolbar> + </layout_panel> + <layout_panel name="non_toolbar_panel" + auto_resize="true" + user_resize="false" + mouse_opaque="false" + height="100" + width="200"> + <view top="0" + follows="all" + height="100" + left="0" + mouse_opaque="false" + name="floater_snap_region" + width="200"/> + <view top="0" + follows="left|top|bottom" + height="100" + left="0" + mouse_opaque="false" + name="minimized_floaters_region" + width="160"/> + <panel follows="left|top|right" + layout="topleft" + height="30" + left_pad="10" + mouse_opaque="false" + name="chiclet_container" + tab_stop="false" + top="0" + bg_visible="false" + width="20"> + </panel> + <panel bottom="100" + follows="left|right|bottom" + height="25" + left="0" + mouse_opaque="false" + tab_stop="false" + name="stand_stop_flying_container" + visible="false" + width="200"/> + </layout_panel> + <layout_panel name="right_toolbar_panel" + auto_resize="false" + user_resize="false" + height="500" + width="30" + mouse_opaque="false"> + <toolbar + button_panel.bg_opaque_image="Rounded_Rect_Left" + follows="right|top|bottom" + name="toolbar_right" + width="30" + left="0" + top="10" + bottom="-10" + side="right" + button_display_mode="icons_only"> + <icon layout="topleft" + height="15" + width="28" + follows="left|top" + top="20" + left="10" + tab_stop="false" + visible="false" + image_name="Caret_Right_Icon" + name="caret" /> + </toolbar> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel name="bottom_toolbar_panel" + auto_resize="false" + user_resize="false" + height="30" + width="1024" + mouse_opaque="false"> + <toolbar layout="topleft" + button_panel.bg_opaque_image="Rounded_Rect_Top" + name="toolbar_bottom" + height="30" + left="40" + right="-40" + top="0" + side="bottom" + follows="left|right|bottom" + button_display_mode="icons_with_text" + visible="true"> + <icon layout="topleft" + height="28" + width="15" + follows="left|top" + top="20" + left="10" + tab_stop="false" + visible="false" + use_draw_context_alpha="false" + image_name="Caret_Bottom_Icon" + name="caret" /> + </toolbar> + </layout_panel> + </layout_stack> +</toolbar_view> diff --git a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml index 79f29777ce..fc527f5f9d 100644 --- a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml @@ -4,7 +4,7 @@ background_opaque="false" bg_opaque_color="Black_50" bg_alpha_color="Black_50" - follows="left|top|right" + follows="left|top" height="19" layout="topleft" name="topinfo_bar" diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml index 7a176ff367..b52784d6bc 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml @@ -67,6 +67,8 @@ top="0" orientation="vertical" name="inbox_outbox_layout_stack" + open_time_constant="0.02" + close_time_constant="0.02" height="235" width="330"> <layout_panel @@ -91,10 +93,10 @@ label="" height="200" width="330"> - <string name="InboxLabelWithArg">Received Items ([NUM])</string> - <string name="InboxLabelNoArg">Received Items</string> + <string name="InboxLabelWithArg">Received items ([NUM])</string> + <string name="InboxLabelNoArg">Received items</string> <button - label="Received Items" + label="Received items" font="SansSerifMedium" name="inbox_btn" height="35" @@ -122,7 +124,7 @@ halign="right" top_pad="0" width="300"> - [NUM] New + [NUM] new </text> <panel follows="all" @@ -173,10 +175,10 @@ label="" height="200" width="330"> - <string name="OutboxLabelWithArg">Merchant Outbox ([NUM])</string> - <string name="OutboxLabelNoArg">Merchant Outbox</string> + <string name="OutboxLabelWithArg">Merchant outbox ([NUM])</string> + <string name="OutboxLabelNoArg">Merchant outbox</string> <button - label="Merchant Outbox" + label="Merchant outbox" font="SansSerifMedium" name="outbox_btn" height="35" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index a41330c9f6..c25d1f57d6 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -16,16 +16,16 @@ <string name="StartupDetectingHardware">Detecting hardware...</string> <string name="StartupLoading">Loading [APP_NAME]...</string> <string name="StartupClearingCache">Clearing cache...</string> - <string name="StartupInitializingTextureCache">Initializing Texture Cache...</string> + <string name="StartupInitializingTextureCache">Initializing texture cache...</string> <string name="StartupInitializingVFS">Initializing VFS...</string> - <string name="StartupRequireDriverUpdate">Graphics Initialization Failed. Please Update Your Graphics Driver!</string> + <string name="StartupRequireDriverUpdate">Graphics initialization failed. Please update your graphics driver!</string> <!-- progress --> <string name="ProgressRestoring">Restoring...</string> - <string name="ProgressChangingResolution">Changing Resolution...</string> + <string name="ProgressChangingResolution">Changing resolution...</string> <!-- Legacy strings, almost never used --> - <string name="Fullbright">Fullbright (Legacy)</string> <!-- used in the Build > materials dropdown--> + <string name="Fullbright">Fullbright (legacy)</string> <!-- used in the Build > materials dropdown--> <!-- Login --> <string name="LoginInProgress">Logging in. [APP_NAME] may appear frozen. Please wait.</string> @@ -38,8 +38,8 @@ <string name="LoginInitializingMultimedia">Initializing multimedia...</string> <string name="LoginInitializingFonts">Loading fonts...</string> <string name="LoginVerifyingCache">Verifying cache files (can take 60-90 seconds)...</string> - <string name="LoginProcessingResponse">Processing Response...</string> - <string name="LoginInitializingWorld">Initializing World...</string> + <string name="LoginProcessingResponse">Processing response...</string> + <string name="LoginInitializingWorld">Initializing world...</string> <string name="LoginDecodingImages">Decoding images...</string> <string name="LoginInitializingQuicktime">Initializing QuickTime...</string> <string name="LoginQuicktimeNotFound">QuickTime not found - unable to initialize.</string> @@ -56,7 +56,7 @@ <string name="CertBasicConstraints">Too many certificates were in the servers Certificate chain. Please contact your Grid administrator.</string> <string name="CertInvalidSignature">The certificate signature returned by the Grid server could not be verified. Please contact your Grid administrator.</string> - <string name="LoginFailedNoNetwork">Network Error: Could not establish connection, please check your network connection.</string> + <string name="LoginFailedNoNetwork">Network error: Could not establish connection, please check your network connection.</string> <string name="LoginFailed">Login failed.</string> <string name="Quit">Quit</string> <string name="create_account_url">http://join.secondlife.com/</string> @@ -2028,7 +2028,7 @@ Returns a string with the requested data about the region <string name="PlacesNoMatchingItems">Didn't find what you're looking for? Try [secondlife:///app/search/places/[SEARCH_TERM] Search].</string> <string name="FavoritesNoMatchingItems">Drag a landmark here to add it to your favorites.</string> <string name="InventoryNoTexture">You do not have a copy of this texture in your inventory</string> - <string name="InventoryInboxNoItems">Items purchased through the marketplace will be delivered here.</string> + <string name="InventoryInboxNoItems">When you purchase or otherwise receive an item, it will appear here so you can drag it to a folder in your inventory, or delete it if you do not wish to keep it.</string> <string name="MarketplaceURL">http://marketplace.[DOMAIN_NAME]</string> <string name="MarketplaceURL_CreateStore">http://marketplace.[DOMAIN_NAME]/create_store</string> <string name="MarketplaceURL_LearnMore">http://marketplace.[DOMAIN_NAME]/learn_more</string> @@ -2051,6 +2051,8 @@ Returns a string with the requested data about the region <string name="Marketplace Error Unsellable Item">Error: This item can not be sold on the marketplace.</string> <string name="Marketplace Error Internal Import">Error: There was a problem with this item. Try again later.</string> + <string name="Open landmarks">Open landmarks</string> + <!-- use value="" because they have preceding spaces --> <string name="no_transfer" value=" (no transfer)" /> <string name="no_modify" value=" (no modify)" /> @@ -2181,6 +2183,8 @@ Returns a string with the requested data about the region <string name="Stomach">Stomach</string> <string name="Left Pec">Left Pec</string> <string name="Right Pec">Right Pec</string> + <string name="Neck">Neck</string> + <string name="Avatar Center">Avatar Center</string> <string name="Invalid Attachment">Invalid Attachment Point</string> <!-- Avatar age computation, see LLDateUtil::ageFromDate --> @@ -3527,6 +3531,10 @@ Try enclosing path to the editor with double quotes. <string name="ExternalEditorCommandParseError">Error parsing the external editor command.</string> <string name="ExternalEditorFailedToRun">External editor failed to run.</string> + <!-- Machine translation of chat messahes --> + <string name="TranslationFailed">Translation failed: [REASON]</string> + <string name="TranslationResponseParseError">Error parsing translation response.</string> + <!-- Key names begin --> <string name="Esc">Esc</string> <string name="Space">Space</string> @@ -3650,8 +3658,64 @@ Try enclosing path to the editor with double quotes. <string name="BeaconSound">Viewing sound beacons (yellow)</string> <string name="BeaconMedia">Viewing media beacons (white)</string> <string name="ParticleHiding">Hiding Particles</string> - - <!-- Mesh UI terms --> + + <!-- commands --> + + <string name="Command_AboutLand_Label">About land</string> + <string name="Command_Appearance_Label">Appearance</string> + <string name="Command_Avatar_Label">Avatar</string> + <string name="Command_Build_Label">Build</string> + <string name="Command_Chat_Label">Chat</string> + <string name="Command_Compass_Label">Compass</string> + <string name="Command_Destinations_Label">Destinations</string> + <string name="Command_Gestures_Label">Gestures</string> + <string name="Command_HowTo_Label">How to</string> + <string name="Command_Inventory_Label">Inventory</string> + <string name="Command_Map_Label">Map</string> + <string name="Command_Marketplace_Label">Marketplace</string> + <string name="Command_MiniMap_Label">Mini-map</string> + <string name="Command_Move_Label">Walk / run / fly</string> + <string name="Command_People_Label">People</string> + <string name="Command_Picks_Label">Picks</string> + <string name="Command_Places_Label">Places</string> + <string name="Command_Preferences_Label">Preferences</string> + <string name="Command_Profile_Label">Profile</string> + <string name="Command_Search_Label">Search</string> + <string name="Command_Snapshot_Label">Snapshot</string> + <string name="Command_Speak_Label">Speak</string> + <string name="Command_View_Label">Camera controls</string> + <string name="Command_Voice_Label">Voice settings</string> + + <string name="Command_AboutLand_Tooltip">Information about the land you're visiting</string> + <string name="Command_Appearance_Tooltip">Change your avatar</string> + <string name="Command_Avatar_Tooltip">Choose a complete avatar</string> + <string name="Command_Build_Tooltip">Building objects and reshaping terrain</string> + <string name="Command_Chat_Tooltip">Chat with people nearby using text</string> + <string name="Command_Compass_Tooltip">Compass</string> + <string name="Command_Destinations_Tooltip">Destinations of interest</string> + <string name="Command_Gestures_Tooltip">Gestures for your avatar</string> + <string name="Command_HowTo_Tooltip">How to do common tasks</string> + <string name="Command_Inventory_Tooltip">View and use your belongings</string> + <string name="Command_Map_Tooltip">Map of the world</string> + <string name="Command_Marketplace_Tooltip">Go shopping</string> + <string name="Command_MiniMap_Tooltip">Show nearby people</string> + <string name="Command_Move_Tooltip">Moving your avatar</string> + <string name="Command_People_Tooltip">Friends, groups, and nearby people</string> + <string name="Command_Picks_Tooltip">Places to show as favorites in your profile</string> + <string name="Command_Places_Tooltip">Places you've saved</string> + <string name="Command_Preferences_Tooltip">Preferences</string> + <string name="Command_Profile_Tooltip">Edit or view your profile</string> + <string name="Command_Search_Tooltip">Find places, events, people</string> + <string name="Command_Snapshot_Tooltip">Take a picture</string> + <string name="Command_Speak_Tooltip">Speak with people nearby using your microphone</string> + <string name="Command_View_Tooltip">Changing camera angle</string> + <string name="Command_Voice_Tooltip">Volume controls for calls and people near you in world</string> + + <string name="Toolbar_Bottom_Tooltip">currently in your bottom toolbar</string> + <string name="Toolbar_Left_Tooltip" >currently in your left toolbar</string> + <string name="Toolbar_Right_Tooltip" >currently in your right toolbar</string> + + <!-- Mesh UI terms --> <string name="Retain%">Retain%</string> <string name="Detail">Detail</string> <string name="Better Detail">Better Detail</string> @@ -3661,4 +3725,11 @@ Try enclosing path to the editor with double quotes. <string name="Preview">Preview</string> <string name="Normal">Normal</string> + <!-- Snapshot image quality levels --> + <string name="snapshot_quality_very_low">Very Low</string> + <string name="snapshot_quality_low">Low</string> + <string name="snapshot_quality_medium">Medium</string> + <string name="snapshot_quality_high">High</string> + <string name="snapshot_quality_very_high">Very High</string> + </strings> diff --git a/indra/newview/skins/default/xui/en/teleport_strings.xml b/indra/newview/skins/default/xui/en/teleport_strings.xml index bae821d3b5..dce6b8dd6d 100644 --- a/indra/newview/skins/default/xui/en/teleport_strings.xml +++ b/indra/newview/skins/default/xui/en/teleport_strings.xml @@ -20,6 +20,10 @@ If you still cannot teleport, please log out and log back in to resolve the prob Sorry, but system was unable to complete the teleport connection. Try again in a moment. </message> + <message name="NoHelpIslandTP"> +You cannot teleport back to Welcome Island. +Go to 'Welcome Island Public' to repeat the tutorial. + </message> <message name="noaccess_tport"> Sorry, you do not have access to that teleport destination. </message> diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml index 61d36468d7..e2baba92a3 100644 --- a/indra/newview/skins/default/xui/en/widgets/button.xml +++ b/indra/newview/skins/default/xui/en/widgets/button.xml @@ -15,7 +15,6 @@ label_color_selected="ButtonLabelSelectedColor" label_color_disabled="ButtonLabelDisabledColor" label_color_disabled_selected="ButtonLabelSelectedDisabledColor" - highlight_color="ButtonUnselectedFgColor" image_color="ButtonImageColor" image_color_disabled="ButtonImageColor" flash_color="ButtonFlashBgColor" @@ -27,5 +26,9 @@ scale_image="true" handle_right_mouse="true" use_draw_context_alpha="true" - held_down_delay.seconds="0.5"> + held_down_delay.seconds="0.5" + button_flash_count="8" + button_flash_rate="1.25" + display_pressed_state="true" + > </button> diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml index 413ca1d1ef..0e29ed0d0b 100644 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml @@ -12,13 +12,20 @@ tab_stop="false" width="25" /> <chiclet_im_adhoc.speaker - auto_update="true" - draw_border="false" - height="23" - left="25" - name="speaker" - visible="false" - width="20" /> + image_mute="Parcel_VoiceNo_Light" + image_off="VoicePTT_Off_Dark" + image_on="VoicePTT_On_Dark" + image_level_1="VoicePTT_Lvl1_Dark" + image_level_2="VoicePTT_Lvl2_Dark" + image_level_3="VoicePTT_Lvl3_Dark" + auto_update="true" + draw_border="false" + height="24" + left="25" + bottom="1" + name="speaker" + visible="false" + width="20" /> <chiclet_im_adhoc.avatar_icon bottom="3" follows="left|top|bottom" diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml index 372a89cbc7..77011139bf 100644 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml @@ -12,13 +12,20 @@ tab_stop="false" width="25" /> <chiclet_im_group.speaker - auto_update="true" - draw_border="false" - height="25" - left="25" - name="speaker" - visible="false" - width="20" /> + image_mute="Parcel_VoiceNo_Light" + image_off="VoicePTT_Off_Dark" + image_on="VoicePTT_On_Dark" + image_level_1="VoicePTT_Lvl1_Dark" + image_level_2="VoicePTT_Lvl2_Dark" + image_level_3="VoicePTT_Lvl3_Dark" + auto_update="true" + draw_border="false" + height="24" + left="25" + bottom="1" + name="speaker" + visible="false" + width="20" /> <chiclet_im_group.group_icon bottom="3" default_icon="Generic_Group" diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml index d27c14f4e7..8b56a8f0f6 100644 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml @@ -12,13 +12,20 @@ tab_stop="false" width="25"/> <chiclet_im_p2p.speaker - auto_update="true" - draw_border="false" - height="23" - left="25" - name="speaker" - visible="false" - width="20" /> + image_mute="Parcel_VoiceNo_Light" + image_off="VoicePTT_Off_Dark" + image_on="VoicePTT_On_Dark" + image_level_1="VoicePTT_Lvl1_Dark" + image_level_2="VoicePTT_Lvl2_Dark" + image_level_3="VoicePTT_Lvl3_Dark" + auto_update="true" + draw_border="false" + height="24" + left="25" + bottom="1" + name="speaker" + visible="false" + width="20" /> <chiclet_im_p2p.avatar_icon bottom="3" color="white" diff --git a/indra/newview/skins/default/xui/en/widgets/floater.xml b/indra/newview/skins/default/xui/en/widgets/floater.xml index 2e5ebafe46..adbb183317 100644 --- a/indra/newview/skins/default/xui/en/widgets/floater.xml +++ b/indra/newview/skins/default/xui/en/widgets/floater.xml @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <!-- See also settings.xml UIFloater* settings for configuration --> -<floater +<floater name="floater" + open_positioning="none" + layout="topleft" bg_opaque_color="FloaterFocusBackgroundColor" bg_alpha_color="FloaterDefaultBackgroundColor" bg_opaque_image="Window_Foreground" diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_item.xml b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_item.xml new file mode 100644 index 0000000000..7a7a6e9a09 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_item.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<inbox_folder_view_item + item_height="20" + item_top_pad="4" + selection_image="Rounded_Square" + > + <new_badge + label="New" + label_offset_horiz="-1" + location="right" + padding_horiz="12.5" + padding_vert="2" + location_offset_hcenter="-23" + border_image="New_Tag_Border" + border_color="DkGray2" + image="New_Tag_Background" + image_color="Black" + /> +</inbox_folder_view_item> diff --git a/indra/newview/skins/default/xui/en/widgets/joystick_rotate.xml b/indra/newview/skins/default/xui/en/widgets/joystick_rotate.xml new file mode 100644 index 0000000000..a190da3909 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/joystick_rotate.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<joystick_rotate + image_selected="Cam_Rotate_In" + image_unselected="Cam_Rotate_Out" + scale_image="false" + mouse_opaque="false" + held_down_delay.seconds="0"/> diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml new file mode 100644 index 0000000000..0aa478ace9 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<toolbar pad_left="1" + pad_right="1" + pad_top="1" + pad_bottom="1" + pad_between="1" + min_girth="24" + mouse_opaque="false" + read_only="false"> + <button_panel name="button_panel" + bg_opaque_image="Rounded_Rect" + background_visible="true" + bg_opaque_image_overlay="MouseGray" + background_opaque="true"/> + <button_icon_and_text imgoverlay_label_space="7" + label_color_selected="White" + halign="left" + image_pressed="PushButton_Press" + image_pressed_selected="PushButton_Selected_Press" + image_selected="PushButton_Selected_Press" + image_disabled_selected="PushButton_Selected_Disabled" + image_disabled="PushButton_Disabled" + button_width.min="70" + button_width.max="140" + desired_height="24" + pad_left="10" + pad_right="10" + follows="left|top" + chrome="true" + image_overlay_alignment="left" + use_ellipses="true" + auto_resize="true" + button_flash_count="99999" + button_flash_rate="1.0" + flash_color="EmphasisColor"/> + <button_icon pad_left="10" + pad_right="10" + image_bottom_pad="10" + image_top_pad="10" + image_pressed="PushButton_Press" + image_pressed_selected="PushButton_Selected_Press" + image_selected="PushButton_Selected_Press" + image_disabled_selected="PushButton_Selected_Disabled" + image_disabled="PushButton_Disabled" + desired_height="38" + button_width.min="38" + button_width.max="38" + follows="left|top" + label="" + halign="left" + chrome="true" + use_ellipses="true" + auto_resize="true" + button_flash_count="99999" + button_flash_rate="1.0" + flash_color="EmphasisColor"/> +</toolbar> |