diff options
Diffstat (limited to 'indra/newview/skins/default/xui/en')
143 files changed, 8168 insertions, 6957 deletions
diff --git a/indra/newview/skins/default/xui/en/alert_button.xml b/indra/newview/skins/default/xui/en/alert_button.xml new file mode 100644 index 0000000000..48c67a3770 --- /dev/null +++ b/indra/newview/skins/default/xui/en/alert_button.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> + +<button + label_shadow="true" + auto_resize="false" + image_overlay_alignment="center" + use_ellipses="flse" + pad_right="10" + pad_left="10" + is_toggle="false" + scale_image="true" + commit_on_return="true" + font="SansSerifSmall" + follows="bottom"/> diff --git a/indra/newview/skins/default/xui/en/alert_check_box.xml b/indra/newview/skins/default/xui/en/alert_check_box.xml new file mode 100644 index 0000000000..9f1bdb5193 --- /dev/null +++ b/indra/newview/skins/default/xui/en/alert_check_box.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<check_box + text_enabled_color="LabelTextColor" + text_disabled_color="LabelDisabledColor" + font="SansSerif" + follows="left|top" + name="check"/>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/alert_icon.xml b/indra/newview/skins/default/xui/en/alert_icon.xml new file mode 100644 index 0000000000..b0886fce06 --- /dev/null +++ b/indra/newview/skins/default/xui/en/alert_icon.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<icon color="1.0 1.0 1.0 1.0" + tab_stop="false" + mouse_opaque="false" + name="icon" + image_name="notify_caution_icon.tga" + follows="left|top"> +</icon> diff --git a/indra/newview/skins/default/xui/en/alert_line_editor.xml b/indra/newview/skins/default/xui/en/alert_line_editor.xml new file mode 100644 index 0000000000..97991153d8 --- /dev/null +++ b/indra/newview/skins/default/xui/en/alert_line_editor.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<line_editor + select_on_focus="false" + handle_edit_keys_directly="false" + revert_on_esc="true" + commit_on_focus_lost="true" + ignore_tab="true" + max_length="254" + text_pad_right="0" + text_pad_left="2" + mouse_opaque="true"/> diff --git a/indra/newview/skins/default/xui/en/floater_aaa.xml b/indra/newview/skins/default/xui/en/floater_aaa.xml index d0d0cc64c5..0c64408b50 100644 --- a/indra/newview/skins/default/xui/en/floater_aaa.xml +++ b/indra/newview/skins/default/xui/en/floater_aaa.xml @@ -5,5 +5,6 @@ name="floater_aaa" can_resize="true" width="1024"> + <string name="Nudge Parabuild">4</string> <panel filename="main_view.xml" follows="all" width="1024" height="768" top="0"/> </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 615d1bf18d..8bfd64b3df 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater can_tear_off="false" height="420" @@ -215,7 +215,6 @@ Go to World menu > About Land or select another parcel to show its details. </text> <button follows="left|top" - font="SansSerifSmall" height="16" label="Profile..." label_selected="Profile..." @@ -247,7 +246,6 @@ Go to World menu > About Land or select another parcel to show its details. width="250" /> <button follows="left|top" - font="SansSerifSmall" height="16" label="Set..." label_selected="Set..." @@ -269,7 +267,6 @@ Go to World menu > About Land or select another parcel to show its details. <button enabled="false" follows="left|top" - font="SansSerifSmall" height="16" label="Deed..." label_selected="Deed..." @@ -928,7 +925,6 @@ Go to World menu > About Land or select another parcel to show its details. bottom="100" enabled="false" follows="left|top" - font="SansSerifSmall" height="16" label="Show" label_selected="Show" @@ -940,7 +936,6 @@ Go to World menu > About Land or select another parcel to show its details. bottom="100" enabled="false" follows="left|top" - font="SansSerifSmall" height="16" label="Return..." label_selected="Return..." @@ -977,7 +972,6 @@ Go to World menu > About Land or select another parcel to show its details. bottom="120" enabled="false" follows="left|top" - font="SansSerifSmall" height="16" label="Show" label_selected="Show" @@ -989,7 +983,6 @@ Go to World menu > About Land or select another parcel to show its details. bottom="120" enabled="false" follows="left|top" - font="SansSerifSmall" height="16" label="Return..." label_selected="Return..." @@ -1026,7 +1019,6 @@ Go to World menu > About Land or select another parcel to show its details. bottom="140" enabled="false" follows="left|top" - font="SansSerifSmall" height="16" label="Show" label_selected="Show" @@ -1038,7 +1030,6 @@ Go to World menu > About Land or select another parcel to show its details. bottom="140" enabled="false" follows="left|top" - font="SansSerifSmall" height="16" label="Return..." label_selected="Return..." @@ -1108,7 +1099,6 @@ Go to World menu > About Land or select another parcel to show its details. </text> <button follows="left|top" - font="SansSerifSmall" height="16" label="Refresh List" label_selected="Refresh List" @@ -1120,7 +1110,6 @@ Go to World menu > About Land or select another parcel to show its details. <button enabled="false" follows="left|top" - font="SansSerifSmall" height="16" label="Return objects..." label_selected="Return objects..." @@ -1531,7 +1520,6 @@ Only large parcels can be listed in search. </text> <button follows="left|top" - font="SansSerifSmall" height="16" label="Set" label_selected="Set" @@ -1543,7 +1531,6 @@ Only large parcels can be listed in search. width="50" /> <button follows="left|top" - font="SansSerifSmall" height="16" label="Clear" label_selected="Clear" @@ -1654,7 +1641,6 @@ Only large parcels can be listed in search. text_readonly_color="0.576471 0.662745 0.835294 1" /> <button follows="left|top" - font="SansSerifSmall" height="16" label="Set..." label_selected="Set..." @@ -1685,7 +1671,6 @@ Only large parcels can be listed in search. width="300" /> <button follows="left|top" - font="SansSerifSmall" height="16" label="Reset..." label_selected="Reset..." @@ -2108,7 +2093,6 @@ Texture: width="195" /> <button follows="bottom" - font="SansSerifSmall" height="16" label="Add..." label_selected="Add..." @@ -2119,7 +2103,6 @@ Texture: width="80" /> <button follows="bottom" - font="SansSerifSmall" height="16" label="Remove" label_selected="Remove" @@ -2155,7 +2138,6 @@ Texture: width="195" /> <button follows="bottom" - font="SansSerifSmall" height="16" label="Add..." label_selected="Add..." @@ -2167,7 +2149,6 @@ Texture: <button enabled="false" follows="bottom" - font="SansSerifSmall" height="16" label="Remove" label_selected="Remove" diff --git a/indra/newview/skins/default/xui/en/floater_animation_preview.xml b/indra/newview/skins/default/xui/en/floater_animation_preview.xml index ebce758d3d..bb45e51137 100644 --- a/indra/newview/skins/default/xui/en/floater_animation_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_animation_preview.xml @@ -163,7 +163,7 @@ Maximum animation length is [MAX_LENGTH] seconds. follows="top|left|right" height="23" layout="topleft" - left="85" + left="100" name="name_form" right="-10" /> <text @@ -182,7 +182,7 @@ Maximum animation length is [MAX_LENGTH] seconds. follows="top|left|right" height="23" layout="topleft" - left="85" + left="100" name="description_form" right="-10" /> <spinner @@ -192,7 +192,7 @@ Maximum animation length is [MAX_LENGTH] seconds. increment="1" initial_value="0" label="Priority" - label_width="90" + label_width="88" layout="topleft" left="10" max_val="4" @@ -214,14 +214,14 @@ Maximum animation length is [MAX_LENGTH] seconds. increment="1" initial_value="0" label="In(%)" - label_width="35" + label_width="49" layout="topleft" top_pad="5" left="30" max_val="100" name="loop_in_point" tool_tip="Sets point in animation that looping returns to" - width="110" /> + width="115" /> <spinner bottom_delta="0" follows="left|top" @@ -234,8 +234,8 @@ Maximum animation length is [MAX_LENGTH] seconds. max_val="100" name="loop_out_point" tool_tip="Sets point in animation that ends a loop" - label_width="45" - width="120" /> + label_width="49" + width="115" /> <text type="string" length="1" @@ -243,6 +243,7 @@ Maximum animation length is [MAX_LENGTH] seconds. follows="top|left" height="23" width="110" + word_wrap="true" layout="topleft" left="10" name="hand_label"> @@ -315,6 +316,7 @@ Maximum animation length is [MAX_LENGTH] seconds. follows="top|left" height="23" width="110" + word_wrap="true" layout="topleft" left="10" name="emote_label"> @@ -395,6 +397,7 @@ Maximum animation length is [MAX_LENGTH] seconds. follows="top|left" height="23" width="110" + word_wrap="true" layout="topleft" left="10" name="preview_label"> @@ -449,28 +452,38 @@ Maximum animation length is [MAX_LENGTH] seconds. width="200" /> <button follows="top|right" - height="28" - image_selected="button_anim_play_selected.tga" - image_unselected="button_anim_play.tga" + height="23" + image_overlay="Play_Over" + image_unselected="SegmentedBtn_Left_Off" + image_selected="SegmentedBtn_Left_On_Selected" + image_disabled_selected="SegmentedBtn_Left_Selected_Disabled" + image_disabled="SegmentedBtn_Left_Disabled" + image_pressed="SegmentedBtn_Left_Press" + image_pressed_selected="SegmentedBtn_Left_Selected_Press" layout="topleft" left="10" name="play_btn" tool_tip="Play/pause your animation" top_pad="0" - width="28" /> + width="23" /> <button follows="top|right" - height="28" - image_selected="button_anim_stop_selected.tga" - image_unselected="button_anim_stop.tga" + height="23" + image_overlay="StopReload_Over" + image_unselected="SegmentedBtn_Right_Off" + image_selected="SegmentedBtn_Right_On_Selected" + image_disabled_selected="SegmentedBtn_Right_Selected_Disabled" + image_disabled="SegmentedBtn_Right_Disabled" + image_pressed="SegmentedBtn_Right_Press" + image_pressed_selected="SegmentedBtn_Right_Selected_Press" layout="topleft" - left_pad="4" name="stop_btn" tool_tip="Stop animation playback" top_delta="0" - width="28" /> + left_delta="23" + width="23" /> <slider - left_pad="0" + left_pad="10" follows="top|right" height="23" width="200" @@ -482,6 +495,8 @@ Maximum animation length is [MAX_LENGTH] seconds. <text type="string" length="1" + height="72" + word_wrap="true" top_pad="5" text_color="EmphasisColor" follows="top|left" 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 3a1499eaaa..953bd08dd4 100644 --- a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml +++ b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml @@ -26,6 +26,12 @@ name="searching"> Searching... </floater.string> + <!-- For multiple person selection, use "Select" and "Close" + instead of "OK" and "Cancel" because "Cancel" still keeps the ones + you have already selected. The code will show the appropriate + set of buttons. --> + <string name="Select">Select</string> + <string name="Close">Close</string> <tab_container follows="all" height="300" @@ -205,7 +211,7 @@ height="23" label="OK" label_selected="OK" - name="Select" + name="ok_btn" top_pad="3" left="46" width="100" /> @@ -214,7 +220,7 @@ height="23" label="Cancel" label_selected="Cancel" - name="Cancel" + name="cancel_btn" width="100" left_pad="5" /> </floater> 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 f0e678af00..56230e912c 100644 --- a/indra/newview/skins/default/xui/en/floater_build_options.xml +++ b/indra/newview/skins/default/xui/en/floater_build_options.xml @@ -15,14 +15,14 @@ height="23" initial_value="1" label="Grid Units (meters)" - label_width="130" + label_width="160" layout="topleft" left="10" max_val="5" min_val="0.01" name="GridResolution" top="25" - width="200" /> + width="230" /> <spinner control_name="GridDrawSize" decimal_digits="1" @@ -31,14 +31,14 @@ increment="0.5" initial_value="5" label="Grid Extents (meters)" - label_width="130" + label_width="160" layout="topleft" left_delta="0" max_val="50" min_val="1" name="GridDrawSize" top_pad="0" - width="200" /> + width="230" /> <check_box control_name="GridSubUnit" height="16" diff --git a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml index 7ae079f553..53ae24fe3f 100644 --- a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml @@ -154,7 +154,7 @@ image_name="Inv_Texture" mouse_opaque="true" name="icon_texture" - tool_top="Textures" + tool_tip="Textures" left_pad="2" /> <button diff --git a/indra/newview/skins/default/xui/en/floater_buy_contents.xml b/indra/newview/skins/default/xui/en/floater_buy_contents.xml index 833e8beb8d..77a0e9b91b 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_contents.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_contents.xml @@ -56,7 +56,7 @@ <text type="string" length="1" - follows="left|top" + follows="left|bottom" font="SansSerif" height="16" layout="topleft" @@ -68,7 +68,7 @@ Buy for L$[AMOUNT] from [NAME]? </text> <check_box - follows="left|top" + follows="left|bottom" height="16" label="Wear clothing now" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml index 2af451400e..d378b427f1 100644 --- a/indra/newview/skins/default/xui/en/floater_camera.xml +++ b/indra/newview/skins/default/xui/en/floater_camera.xml @@ -12,6 +12,7 @@ help_topic="camera_floater" save_rect="true" save_visibility="true" + single_instance="true" width="150"> <floater.string name="rotate_tooltip"> @@ -87,9 +88,9 @@ <button follows="top|left" height="18" - image_disabled="AddItem_Disabled" - image_selected="AddItem_Press" - image_unselected="AddItem_Off" + image_disabled="MinusItem_Disabled" + image_selected="MinusItem_Press" + image_unselected="MinusItem_Off" layout="topleft" name="zoom_minus_btn" top_pad="0" @@ -107,6 +108,7 @@ image_unselected="Cam_Rotate_Out" layout="topleft" left="45" + mouse_opaque="false" name="cam_rotate_stick" quadrant="left" scale_image="false" diff --git a/indra/newview/skins/default/xui/en/floater_customize.xml b/indra/newview/skins/default/xui/en/floater_customize.xml index 6c4f10e61e..275ab5bb8b 100644 --- a/indra/newview/skins/default/xui/en/floater_customize.xml +++ b/indra/newview/skins/default/xui/en/floater_customize.xml @@ -64,7 +64,6 @@ width="82" /> <button follows="left|top" - font="SansSerifSmall" height="16" label="Body" label_selected="Body" @@ -75,7 +74,6 @@ width="82" /> <button follows="left|top" - font="SansSerifSmall" height="16" label="Head" label_selected="Head" @@ -86,7 +84,6 @@ width="82" /> <button follows="left|top" - font="SansSerifSmall" height="16" label="Eyes" label_selected="Eyes" @@ -97,7 +94,6 @@ width="82" /> <button follows="left|top" - font="SansSerifSmall" height="16" label="Ears" label_selected="Ears" @@ -108,7 +104,6 @@ width="82" /> <button follows="left|top" - font="SansSerifSmall" height="16" label="Nose" label_selected="Nose" @@ -119,7 +114,6 @@ width="82" /> <button follows="left|top" - font="SansSerifSmall" height="16" label="Mouth" label_selected="Mouth" @@ -130,7 +124,6 @@ width="82" /> <button follows="left|top" - font="SansSerifSmall" height="16" label="Chin" label_selected="Chin" @@ -141,7 +134,6 @@ width="82" /> <button follows="left|top" - font="SansSerifSmall" height="16" label="Torso" label_selected="Torso" @@ -152,7 +144,6 @@ width="82" /> <button follows="left|top" - font="SansSerifSmall" height="16" label="Legs" label_selected="Legs" @@ -351,7 +342,6 @@ scratch and wear it. width="16" /> <button follows="left|top" - font="SansSerifSmall" height="16" label="Skin Color" label_selected="Skin Color" @@ -362,7 +352,6 @@ scratch and wear it. width="82" /> <button follows="left|top" - font="SansSerifSmall" height="16" label="Face Detail" label_selected="Face Detail" @@ -373,7 +362,6 @@ scratch and wear it. width="82" /> <button follows="left|top" - font="SansSerifSmall" height="16" label="Makeup" label_selected="Makeup" @@ -384,7 +372,6 @@ scratch and wear it. width="82" /> <button follows="left|top" - font="SansSerifSmall" height="16" label="Body Detail" label_selected="Body Detail" @@ -606,7 +593,6 @@ scratch and wear it. width="16" /> <button follows="left|top" - font="SansSerifSmall" height="16" label="Color" label_selected="Color" @@ -617,7 +603,6 @@ scratch and wear it. width="82" /> <button follows="left|top" - font="SansSerifSmall" height="16" label="Style" label_selected="Style" @@ -628,7 +613,6 @@ scratch and wear it. width="82" /> <button follows="left|top" - font="SansSerifSmall" height="16" label="Eyebrows" label_selected="Eyebrows" @@ -639,7 +623,6 @@ scratch and wear it. width="82" /> <button follows="left|top" - font="SansSerifSmall" height="16" label="Facial" label_selected="Facial" @@ -3383,6 +3366,16 @@ scratch and wear it. bottom="536" follows="right|bottom" height="20" + label="Make Outfit" + label_selected="Make Outfit" + layout="topleft" + name="make_outfit_btn" + right="-216" + width="100" /> + <button + bottom="536" + follows="right|bottom" + height="20" label="Cancel" label_selected="Cancel" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/floater_env_settings.xml b/indra/newview/skins/default/xui/en/floater_env_settings.xml index 5233cb023d..5e78037ee1 100644 --- a/indra/newview/skins/default/xui/en/floater_env_settings.xml +++ b/indra/newview/skins/default/xui/en/floater_env_settings.xml @@ -136,7 +136,6 @@ width="210" /> <button follows="left|top" - font="SansSerifSmall" height="20" label="Use Estate Time" layout="topleft" @@ -146,7 +145,6 @@ width="137" /> <button follows="left|top" - font="SansSerifSmall" height="20" label="Advanced Sky" layout="topleft" @@ -156,7 +154,6 @@ width="137" /> <button follows="left|top" - font="SansSerifSmall" height="20" label="Advanced Water" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/floater_gesture.xml b/indra/newview/skins/default/xui/en/floater_gesture.xml index b23482655c..9f5e6828d2 100644 --- a/indra/newview/skins/default/xui/en/floater_gesture.xml +++ b/indra/newview/skins/default/xui/en/floater_gesture.xml @@ -21,12 +21,16 @@ name="playing"> (Playing) </floater.string> + <!-- It's used to build new name for gesture created by "Copy" menu item --> + <floater.string + name="copy_name">Copy of [COPY_NAME]</floater.string> <scroll_list bottom_delta="400" draw_heading="true" follows="all" layout="topleft" left="0" + multi_select="true" top="20" name="gesture_list"> <scroll_list.columns @@ -57,18 +61,18 @@ left="0" name="bottom_panel" width="313"> - <button + <menu_button follows="bottom|left" - font="SansSerifBigBold" - tool_tip="Change sort and view of recent residents list" height="18" image_disabled="OptionsMenu_Disabled" image_selected="OptionsMenu_Press" image_unselected="OptionsMenu_Off" layout="topleft" left="10" - name="recent_viewsort_btn" + menu_filename="menu_gesture_gear.xml" + name="gear_btn" top="5" + tool_tip="More options" width="18" /> <button follows="bottom|left" @@ -83,22 +87,35 @@ tool_tip="Make new gesture" top_delta="0" width="18" /> - <button + <button follows="bottom|left" font="SansSerifBigBold" + height="10" + image_hover_selected="Activate_Checkmark" + image_selected="Activate_Checkmark" + image_unselected="Activate_Checkmark" + layout="topleft" + left_pad="5" + name="activate_btn" + tool_tip="Activate/Deactivate selected gesture" + top="10" + width="10" /> + <button + follows="bottom|right" + font="SansSerifBigBold" height="18" image_selected="TrashItem_Press" image_unselected="TrashItem_Off" image_disabled="TrashItem_Disabled" layout="topleft" - left_pad="230" name="del_btn" + right="-5" tool_tip="Delete this gesture" top_delta="0" width="18" /> </panel> <button - follows="bottom|right" + follows="left|bottom" height="23" label="Edit" layout="topleft" @@ -107,7 +124,7 @@ top_pad="5" width="83" /> <button - follows="bottom|right" + follows="left|bottom" height="23" label="Play" layout="topleft" @@ -116,7 +133,7 @@ top_delta="0" width="83" /> <button - follows="bottom|right" + follows="left|bottom" height="23" label="Stop" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/floater_god_tools.xml b/indra/newview/skins/default/xui/en/floater_god_tools.xml index 79eed52fbf..b01c0edc8b 100644 --- a/indra/newview/skins/default/xui/en/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_god_tools.xml @@ -191,7 +191,6 @@ </check_box> <button follows="top|right" - font="SansSerifSmall" height="22" label="Bake Terrain" label_selected="Bake Terrain" @@ -206,7 +205,6 @@ </button> <button follows="top|right" - font="SansSerifSmall" height="22" label="Revert Terrain" label_selected="Revert Terrain" @@ -220,7 +218,6 @@ </button> <button follows="top|right" - font="SansSerifSmall" height="22" label="Swap Terrain" label_selected="Swap Terrain" @@ -419,7 +416,6 @@ <button follows="top|right" - font="SansSerifSmall" height="22" label="Refresh" label_selected="Refresh" @@ -434,7 +430,6 @@ </button> <button follows="top|right" - font="SansSerifSmall" height="22" label="Apply" label_selected="Apply" @@ -449,7 +444,6 @@ </button> <button follows="top|right" - font="SansSerifSmall" height="22" label="Select Region" label_selected="Select Region" @@ -464,7 +458,6 @@ </button> <button follows="top|right" - font="SansSerifSmall" height="22" label="Autosave now" label_selected="Autosave now" @@ -556,7 +549,6 @@ </check_box> <button follows="top|right" - font="SansSerifSmall" height="22" label="Apply" label_selected="Apply" @@ -571,7 +563,6 @@ </button> <button follows="top|right" - font="SansSerifSmall" height="22" label="Set Target" label_selected="Set Target" @@ -598,7 +589,6 @@ </text> <button follows="top|right" - font="SansSerifSmall" height="22" label="Delete Target's Scripted Objects On Others Land" label_selected="Delete Target's Scripted Objects On Others Land" @@ -613,7 +603,6 @@ </button> <button follows="top|right" - font="SansSerifSmall" height="22" label="Delete Target's Scripted Objects On *Any* Land" label_selected="Delete Target's Scripted Objects On *Any* Land" @@ -628,7 +617,6 @@ </button> <button follows="top|right" - font="SansSerifSmall" height="22" label="Delete *ALL* Of Target's Objects" label_selected="Delete *ALL* Of Target's Objects" @@ -643,7 +631,6 @@ </button> <button follows="top|right" - font="SansSerifSmall" height="20" label="Get Top Colliders" label_selected="Get Top Colliders" @@ -658,7 +645,6 @@ </button> <button follows="top|right" - font="SansSerifSmall" height="20" label="Get Top Scripts" label_selected="Get Top Scripts" @@ -673,7 +659,6 @@ </button> <button follows="top|right" - font="SansSerifSmall" height="20" label="Scripts digest" label_selected="Scripts digest" diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml new file mode 100644 index 0000000000..cf6a4e45bd --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_im_container.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<multi_floater
+background_visible="true"
+bg_color="yellow"
+ can_resize="true"
+ height="390"
+ layout="topleft"
+ name="floater_im_box"
+ help_topic="floater_im_box"
+ save_rect="true"
+ save_visibility="true"
+ single_instance="true"
+ title="Instant Messages"
+ width="392">
+ <tab_container
+ follows="left|right|top|bottom"
+ height="390"
+ layout="topleft"
+ left="1"
+ name="im_box_tab_container"
+ tab_position="bottom"
+ tab_width="80"
+ top="0"
+ width="390" />
+ <icon
+ color="DefaultShadowLight"
+ enabled="false"
+ follows="left|right|bottom"
+ height="17"
+ image_name="tabarea.tga"
+ layout="bottomleft"
+ left="1"
+ name="im_box_tab_container_icon"
+ bottom="10"
+ width="390" />
+</multi_floater>
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 452d28d4ea..645c2973d8 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -2,75 +2,79 @@ <floater legacy_header_height="18" background_visible="true" - follows="left|top|right|bottom" - height="369" + follows="all" + height="350" layout="topleft" left="0" name="panel_im" - help_topic="panel_im" top="0" - can_dock="true" - can_minimize="true" - visible="true" - width="520" + can_close="true" + can_dock="false" + can_minimize="false" + visible="true" + width="300" can_resize="true" - min_width="350" - min_height="369"> - <layout_stack follows="left|top|right|bottom" - height="354" - width="520" - layout="topleft" - orientation="horizontal" - name="im_panels" - top="16" - left="2"> + min_width="300" + min_height="350"> + <layout_stack + follows="all" + height="320" + width="300" + layout="topleft" + orientation="horizontal" + name="im_panels" + top="20" + left="0"> <layout_panel name="panel_im_control_panel" layout="topleft" - top_delta="-3" - height="354" follows="left" label="IM Control Panel" auto_resize="false" user_resize="false" /> - <layout_panel height="354" - width="355" - left_delta="146" - top="0" - user_resize="false"> - <button height="12" - follows="left|top" - top="8" - label="<<" - layout="topleft" - width="35" - name="slide_left_btn" /> - <button height="12" - follows="left|top" - top="8" - label=">>" - layout="topleft" - width="35" - name="slide_right_btn" /> - <chat_history - length="1" - follows="left|top|right|bottom" - font="SansSerif" - height="300" - layout="topleft" - name="chat_history" - parse_highlights="true" - allow_html="true" - width="350"> - </chat_history> - <line_editor - follows="left|right" - height="20" - label="To" - layout="topleft" - name="chat_editor" - width="345"> - </line_editor> + <layout_panel + left="0" + top="0" + height="200" + width="185" + user_resize="false"> + <button + height="20" + follows="left|top" + top="0" + left="2" + image_overlay="TabIcon_Open_Off" + layout="topleft" + width="25" + name="slide_left_btn" /> + <button + height="20" + follows="left|top" + top="0" + left="2" + image_overlay="TabIcon_Close_Off" + width="25" + name="slide_right_btn" /> + <chat_history + font="SansSerifSmall" + follows="left|right|top|bottom" + height="150" + name="chat_history" + parse_highlights="true" + allow_html="true" + left="1" + width="180"> + </chat_history> + <line_editor + bottom="0" + follows="left|right|bottom" + font="SansSerifSmall" + height="20" + label="To" + layout="bottomleft" + name="chat_editor" + width="180"> + </line_editor> </layout_panel> </layout_stack> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_image_preview.xml b/indra/newview/skins/default/xui/en/floater_image_preview.xml index 2562daf4b3..6f8f272128 100644 --- a/indra/newview/skins/default/xui/en/floater_image_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_image_preview.xml @@ -47,9 +47,11 @@ <text type="string" length="1" - bottom_delta="20" + bottom_delta="30" follows="top|left" - height="15" + height="25" + width="105" + word_wrap="true" layout="topleft" name="preview_label"> Preview image as: @@ -96,7 +98,9 @@ <text type="string" length="1" - bottom="190" + bottom="225" + height="45" + word_wrap="true" follows="top|left" layout="topleft" left="10" @@ -114,7 +118,7 @@ Try saving image as 24 bit Targa (.tga). layout="topleft" left_delta="2" name="lossless_check" - top_pad="197" + top_pad="162" width="280" /> <button follows="bottom|right" diff --git a/indra/newview/skins/default/xui/en/floater_inventory.xml b/indra/newview/skins/default/xui/en/floater_inventory.xml index b48c962413..dca1692e4a 100644 --- a/indra/newview/skins/default/xui/en/floater_inventory.xml +++ b/indra/newview/skins/default/xui/en/floater_inventory.xml @@ -30,13 +30,12 @@ name="Fetched"> Fetched </floater.string> -<panel + <panel bottom="560" class="panel_main_inventory" filename="panel_main_inventory.xml" follows="all" layout="topleft" - hide_top_panel="true" left="0" label="Inventory Panel" name="Inventory Panel" 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 4ca6002c13..366098013b 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 @@ -106,12 +106,11 @@ left_delta="78" name="LabelCreatorName" top_delta="0" - width="200"> + width="170"> Nicole Linden </text> <button follows="top|right" - font="SansSerifSmall" height="16" label="Profile..." layout="topleft" @@ -140,12 +139,11 @@ left_delta="78" name="LabelOwnerName" top_delta="0" - width="200"> + width="170"> Thrax Linden </text> <button follows="top|right" - font="SansSerifSmall" height="16" label="Profile..." layout="topleft" @@ -257,12 +255,13 @@ type="string" length="1" follows="left|top" - height="10" + height="25" layout="topleft" left="10" name="NextOwnerLabel" top_pad="5" - width="78"> + width="78" + word_wrap="true"> Next owner: </text> <check_box @@ -303,7 +302,7 @@ layout="topleft" follows="left|top" name="combobox sale copy" - width="90"> + width="110"> <combo_box.item label="Copy" name="Copy" @@ -319,14 +318,26 @@ increment="1" control_name="Edit Cost" name="Edit Cost" - label="Price: L$" - label_width="60" + label="Price:" + label_width="100" left="10" - width="180" + width="192" min_val="1" height="19" max_val="999999999" top_pad="5"/> + <text + type="string" + length="1" + height="15" + follows="left|top" + layout="topleft" + left_delta="82" + name="CurrencySymbol" + top_delta="1" + width="18"> + L$ + </text> <!--line_editor border_style="line" 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 2c04a94613..06c766f744 100644 --- a/indra/newview/skins/default/xui/en/floater_land_holdings.xml +++ b/indra/newview/skins/default/xui/en/floater_land_holdings.xml @@ -42,7 +42,6 @@ </scroll_list> <button height="23" - font="SansSerifBold" label="Teleport" label_selected="Teleport" layout="topleft" @@ -53,7 +52,6 @@ width="80" /> <button height="23" - font="SansSerifBold" label="Map" label_selected="Map" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml index 5a8ffcebea..cff0c29dfc 100644 --- a/indra/newview/skins/default/xui/en/floater_moveview.xml +++ b/indra/newview/skins/default/xui/en/floater_moveview.xml @@ -151,8 +151,7 @@ top="2" width="31" /> <button - follows="left|bottom" - font="SansSerifSmall" + follows="left|bottom" height="23" image_overlay="Move_Run_Off" image_selected="PushButton_Selected_Press" diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml index 7f58ea132e..d8534bfe0b 100644 --- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml +++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml @@ -1,17 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater legacy_header_height="18" - can_minimize="true" + can_minimize="false" can_tear_off="false" - can_resize="false" + can_resize="true" can_drag_on_left="false" - can_close="false" + can_close="true" can_dock="true" bevel_style="in" height="300" layout="topleft" name="nearby_chat" - help_topic="nearby_chat" save_rect="true" title="NEARBY CHAT" save_dock_state="true" @@ -19,19 +18,17 @@ single_instance="true" width="320"> <chat_history - allow_html="true" + allow_html="true" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" follows="all" - left="1" + left="1" top="20" - font="SansSerif" layout="topleft" - height="280" + height="280" name="chat_history" - parse_highlights="true" + parse_highlights="true" text_color="ChatHistoryTextColor" text_readonly_color="ChatHistoryTextColor" - width="320"/> - + width="320" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_openobject.xml b/indra/newview/skins/default/xui/en/floater_openobject.xml index 3fd118df1c..41a440aaa0 100644 --- a/indra/newview/skins/default/xui/en/floater_openobject.xml +++ b/indra/newview/skins/default/xui/en/floater_openobject.xml @@ -38,7 +38,6 @@ width="284" /> <button follows="bottom|left" - font="SansSerifSmall" height="23" label="Copy To Inventory" label_selected="Copy To Inventory" @@ -53,7 +52,6 @@ </button> <button follows="bottom|left" - font="SansSerifSmall" height="23" label="Copy And Wear" label_selected="Copy And Wear" 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 82417de8a7..ae4d5042ef 100644 --- a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml @@ -59,6 +59,17 @@ Connecting to [CALLEE_NAME] Calling [CALLEE_NAME] </text> <text + font="SansSerifLarge" + height="20" + layout="topleft" + left="77" + name="noanswer" + top="27" + width="315" + word_wrap="true"> +No Answer. Please try again later. + </text> + <text font="SansSerif" height="50" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/floater_perm_prefs.xml b/indra/newview/skins/default/xui/en/floater_perm_prefs.xml index 6faab84159..4909b8988f 100644 --- a/indra/newview/skins/default/xui/en/floater_perm_prefs.xml +++ b/indra/newview/skins/default/xui/en/floater_perm_prefs.xml @@ -22,10 +22,10 @@ height="16" label="Share with group" layout="topleft" - left_delta="-250" + left="10" name="share_with_group" - top_delta="2" - width="106" /> + top="5" + width="150" /> <check_box control_name="EveryoneCopy" height="16" @@ -33,8 +33,8 @@ layout="topleft" left_delta="0" name="everyone_copy" - top_pad="16" - width="130" /> + top_pad="5" + width="150" /> <text type="string" length="1" @@ -43,8 +43,8 @@ layout="topleft" left_delta="0" name="NextOwnerLabel" - top_pad="16" - width="88"> + top_pad="5" + width="150"> Next owner can: </text> <check_box @@ -54,17 +54,17 @@ layout="topleft" left_delta="0" name="next_owner_modify" - top_pad="14" - width="78" /> + top_pad="5" + width="150" /> <check_box control_name="NextOwnerCopy" height="16" label="Copy" layout="topleft" - left_delta="78" + left_delta="0" name="next_owner_copy" - top_delta="0" - width="88" > + top_pad="5" + width="150" > <check_box.commit_callback function="Perms.Copy" /> </check_box> @@ -76,10 +76,10 @@ initial_value="true" label="Resell/Give away" layout="topleft" - left_delta="88" + left_delta="0" name="next_owner_transfer" - top_delta="0" - width="106" /> + top_pad="5" + width="150" /> </panel> <button height="20" 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 3b84358484..bbfb362337 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_animation.xml @@ -38,7 +38,6 @@ width="170" /> <button height="20" - font="SansSerifSmall" label="Play in World" label_selected="Stop" layout="topleft" @@ -49,7 +48,6 @@ width="125" /> <button height="20" - font="SansSerifSmall" label="Play Locally" label_selected="Stop" layout="topleft" 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 4f3978a5e3..8cc2c91ef5 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml @@ -173,7 +173,6 @@ <button follows="top|left" height="20" - font="SansSerifSmall" label="Add >>" layout="topleft" left_pad="10" @@ -205,7 +204,6 @@ <button follows="top|left" height="20" - font="SansSerifSmall" label="Up" layout="topleft" left_pad="10" @@ -215,7 +213,6 @@ <button follows="top|left" height="20" - font="SansSerifSmall" label="Down" layout="topleft" left_delta="0" @@ -225,7 +222,6 @@ <button follows="top|left" height="20" - font="SansSerifSmall" label="Remove" layout="topleft" left_delta="0" 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 95347f0dff..68a78d5017 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_sound.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_sound.xml @@ -50,7 +50,6 @@ <button follows="left|top" height="22" - font="SansSerifSmall" label="Play Locally" label_selected="Play Locally" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/floater_region_info.xml b/indra/newview/skins/default/xui/en/floater_region_info.xml index 9bb30f8e86..262bcd07a0 100644 --- a/indra/newview/skins/default/xui/en/floater_region_info.xml +++ b/indra/newview/skins/default/xui/en/floater_region_info.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater legacy_header_height="18" - height="512" + height="555" help_topic="regioninfo" layout="topleft" name="regioninfo" @@ -9,7 +9,7 @@ title="REGION/ESTATE" width="480"> <tab_container - bottom="512" + bottom="555" follows="left|right|top|bottom" layout="topleft" left="1" diff --git a/indra/newview/skins/default/xui/en/floater_report_abuse.xml b/indra/newview/skins/default/xui/en/floater_report_abuse.xml index 696233676c..91ca3ef27a 100644 --- a/indra/newview/skins/default/xui/en/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/en/floater_report_abuse.xml @@ -18,7 +18,7 @@ height="150" layout="topleft" left="60" - name="" + name="screenshot" top="15" width="220" /> <check_box diff --git a/indra/newview/skins/default/xui/en/floater_script.xml b/indra/newview/skins/default/xui/en/floater_script.xml new file mode 100644 index 0000000000..f44ba6d873 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_script.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + background_visible="true" + follows="left|top|right|bottom" + height="369" + layout="topleft" + left="0" + name="script_floater" + help_topic="script_floater" + top="0" + can_dock="true" + can_minimize="true" + visible="true" + width="520" + can_resize="true" + min_width="350" + min_height="369"> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_select_key.xml b/indra/newview/skins/default/xui/en/floater_select_key.xml index 31d133ff9b..af4fdff044 100644 --- a/indra/newview/skins/default/xui/en/floater_select_key.xml +++ b/indra/newview/skins/default/xui/en/floater_select_key.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater legacy_header_height="18" - border="true" + border="false" can_close="false" can_minimize="false" height="100" diff --git a/indra/newview/skins/default/xui/en/floater_sell_land.xml b/indra/newview/skins/default/xui/en/floater_sell_land.xml index 2cf800fb15..e6a78563f3 100644 --- a/indra/newview/skins/default/xui/en/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/en/floater_sell_land.xml @@ -205,7 +205,6 @@ width="130" /> <button height="20" - font="SansSerifSmall" label="Select" layout="topleft" left_pad="5" @@ -267,7 +266,6 @@ </radio_group> <button height="20" - font="SansSerifSmall" label="Show Objects" layout="topleft" name="show_objects" @@ -290,7 +288,6 @@ <button follows="bottom|left" height="20" - font="SansSerifSmall" label="Set Land For Sale" layout="topleft" left_delta="0" @@ -300,7 +297,6 @@ <button follows="bottom|right" height="20" - font="SansSerifSmall" label="Cancel" layout="topleft" left_pad="30" diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml index 95a40e27f7..8860ac1e50 100644 --- a/indra/newview/skins/default/xui/en/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml @@ -120,7 +120,6 @@ width="85" /> <button follows="left|top" - font="SansSerifSmall" height="20" label="More >>" layout="topleft" @@ -131,7 +130,6 @@ width="80" /> <button follows="left|top" - font="SansSerifSmall" height="20" label="<< Less" 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 68a4867167..f9dacf0207 100644 --- a/indra/newview/skins/default/xui/en/floater_stats.xml +++ b/indra/newview/skins/default/xui/en/floater_stats.xml @@ -405,179 +405,179 @@ show_bar="false" show_mean="false" > </stat_bar> + </stat_view> - <stat_bar - name="simagentups" - label="Agent Updates/Sec" - stat="simagentups" - precision="1" - bar_min="0.f" - bar_max="100.f" - tick_spacing="25.f" - label_spacing="50.f" - show_per_sec="false" - show_bar="false" - show_mean="false" > - </stat_bar> + <stat_bar + name="simagentups" + label="Agent Updates/Sec" + stat="simagentups" + precision="1" + bar_min="0.f" + bar_max="100.f" + tick_spacing="25.f" + label_spacing="50.f" + show_per_sec="false" + show_bar="false" + show_mean="false" > + </stat_bar> - <stat_bar - name="simmainagents" - label="Main Agents" - stat="simmainagents" - precision="0" - bar_min="0.f" - bar_max="80.f" - tick_spacing="10.f" - label_spacing="40.f" - show_per_sec="false" - show_bar="false" - show_mean="false" > - </stat_bar> + <stat_bar + name="simmainagents" + label="Main Agents" + stat="simmainagents" + precision="0" + bar_min="0.f" + bar_max="80.f" + tick_spacing="10.f" + label_spacing="40.f" + show_per_sec="false" + show_bar="false" + show_mean="false" > + </stat_bar> - <stat_bar - name="simchildagents" - label="Child Agents" - stat="simchildagents" - precision="0" - bar_min="0.f" - bar_max="40.f" - tick_spacing="5.f" - label_spacing="10.f" - show_per_sec="false" - show_bar="false" - show_mean="false" > - </stat_bar> + <stat_bar + name="simchildagents" + label="Child Agents" + stat="simchildagents" + precision="0" + bar_min="0.f" + bar_max="40.f" + tick_spacing="5.f" + label_spacing="10.f" + show_per_sec="false" + show_bar="false" + show_mean="false" > + </stat_bar> - <stat_bar - name="simobjects" - label="Objects" - stat="simobjects" - precision="0" - bar_min="0.f" - bar_max="30000.f" - tick_spacing="5000.f" - label_spacing="10000.f" - show_per_sec="false" - show_bar="false" - show_mean="false" > - </stat_bar> + <stat_bar + name="simobjects" + label="Objects" + stat="simobjects" + precision="0" + bar_min="0.f" + bar_max="30000.f" + tick_spacing="5000.f" + label_spacing="10000.f" + show_per_sec="false" + show_bar="false" + show_mean="false" > + </stat_bar> - <stat_bar - name="simactiveobjects" - label="Active Objects" - stat="simactiveobjects" - precision="0" - bar_min="0.f" - bar_max="800.f" - tick_spacing="100.f" - label_spacing="200.f" - show_per_sec="false" - show_bar="false" - show_mean="false" > - </stat_bar> + <stat_bar + name="simactiveobjects" + label="Active Objects" + stat="simactiveobjects" + precision="0" + bar_min="0.f" + bar_max="800.f" + tick_spacing="100.f" + label_spacing="200.f" + show_per_sec="false" + show_bar="false" + show_mean="false" > + </stat_bar> - <stat_bar - name="simactivescripts" - label="Active Scripts" - stat="simactivescripts" - precision="0" - bar_min="0.f" - bar_max="800.f" - tick_spacing="100.f" - label_spacing="200.f" - show_per_sec="false" - show_bar="false" - show_mean="false" > - </stat_bar> + <stat_bar + name="simactivescripts" + label="Active Scripts" + stat="simactivescripts" + precision="0" + bar_min="0.f" + bar_max="800.f" + tick_spacing="100.f" + label_spacing="200.f" + show_per_sec="false" + show_bar="false" + show_mean="false" > + </stat_bar> - <stat_bar - name="simscripteps" - label="Script Events" - stat="simscripteps" - unit_label="eps" - precision="0" - bar_min="0.f" - bar_max="20000.f" - tick_spacing="2500.f" - label_spacing="5000.f" - show_per_sec="false" - show_bar="false" - show_mean="false" > - </stat_bar> + <stat_bar + name="simscripteps" + label="Script Events" + stat="simscripteps" + unit_label="eps" + precision="0" + bar_min="0.f" + bar_max="20000.f" + tick_spacing="2500.f" + label_spacing="5000.f" + show_per_sec="false" + show_bar="false" + show_mean="false" > + </stat_bar> - <stat_bar - name="siminpps" - label="Packets In" - stat="siminpps" - unit_label="pps" - precision="0" - bar_min="0.f" - bar_max="2000.f" - tick_spacing="250.f" - label_spacing="1000.f" - show_per_sec="false" - show_bar="false" - show_mean="false" > - </stat_bar> + <stat_bar + name="siminpps" + label="Packets In" + stat="siminpps" + unit_label="pps" + precision="0" + bar_min="0.f" + bar_max="2000.f" + tick_spacing="250.f" + label_spacing="1000.f" + show_per_sec="false" + show_bar="false" + show_mean="false" > + </stat_bar> - <stat_bar - name="simoutpps" - label="Packets Out" - stat="simoutpps" - unit_label="pps" - precision="0" - bar_min="0.f" - bar_max="2000.f" - tick_spacing="250.f" - label_spacing="1000.f" - show_per_sec="false" - show_bar="false" - show_mean="false" > - </stat_bar> + <stat_bar + name="simoutpps" + label="Packets Out" + stat="simoutpps" + unit_label="pps" + precision="0" + bar_min="0.f" + bar_max="2000.f" + tick_spacing="250.f" + label_spacing="1000.f" + show_per_sec="false" + show_bar="false" + show_mean="false" > + </stat_bar> - <stat_bar - name="simpendingdownloads" - label="Pending Downloads" - stat="simpendingdownloads" - precision="0" - bar_min="0.f" - bar_max="800.f" - tick_spacing="100.f" - label_spacing="200.f" - show_per_sec="false" - show_bar="false" - show_mean="false" > - </stat_bar> + <stat_bar + name="simpendingdownloads" + label="Pending Downloads" + stat="simpendingdownloads" + precision="0" + bar_min="0.f" + bar_max="800.f" + tick_spacing="100.f" + label_spacing="200.f" + show_per_sec="false" + show_bar="false" + show_mean="false" > + </stat_bar> - <stat_bar - name="simpendinguploads" - label="Pending Uploads" - stat="simpendinguploads" - precision="0" - bar_min="0.f" - bar_max="100.f" - tick_spacing="25.f" - label_spacing="50.f" - show_per_sec="false" - show_bar="false" - show_mean="false" > - </stat_bar> + <stat_bar + name="simpendinguploads" + label="Pending Uploads" + stat="simpendinguploads" + precision="0" + bar_min="0.f" + bar_max="100.f" + tick_spacing="25.f" + label_spacing="50.f" + show_per_sec="false" + show_bar="false" + show_mean="false" > + </stat_bar> - <stat_bar - name="simtotalunackedbytes" - label="Total Unacked Bytes" - stat="simtotalunackedbytes" - unit_label="kb" - precision="0" - bar_min="0.f" - bar_max="100000.f" - tick_spacing="25000.f" - label_spacing="50000.f" - show_per_sec="false" - show_bar="false" - show_mean="false" > - </stat_bar> - </stat_view> + <stat_bar + name="simtotalunackedbytes" + label="Total Unacked Bytes" + stat="simtotalunackedbytes" + unit_label="kb" + precision="0" + bar_min="0.f" + bar_max="100000.f" + tick_spacing="25000.f" + label_spacing="50000.f" + show_per_sec="false" + show_bar="false" + show_mean="false" > + </stat_bar> <stat_view name="simperf" 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 e1f07a49e7..be6d63716c 100644 --- a/indra/newview/skins/default/xui/en/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/en/floater_sys_well.xml @@ -15,7 +15,7 @@ height="23" can_minimize="true" can_tear_off="false" - can_resize="false" + can_resize="true" can_drag_on_left="false" can_close="false" can_dock="true" diff --git a/indra/newview/skins/default/xui/en/floater_telehub.xml b/indra/newview/skins/default/xui/en/floater_telehub.xml index cc0ab8c57e..374f014908 100644 --- a/indra/newview/skins/default/xui/en/floater_telehub.xml +++ b/indra/newview/skins/default/xui/en/floater_telehub.xml @@ -57,7 +57,6 @@ </text> <button follows="top|left" - font="SansSerifSmall" height="20" label="Connect Telehub" layout="topleft" @@ -67,7 +66,6 @@ width="110" /> <button follows="top|left" - font="SansSerifSmall" height="20" label="Disconnect" layout="topleft" @@ -97,7 +95,6 @@ width="230" /> <button follows="top|left" - font="SansSerifSmall" height="20" label="Add Spawn" layout="topleft" @@ -107,7 +104,6 @@ width="110" /> <button follows="top|left" - font="SansSerifSmall" height="20" label="Remove Spawn" layout="topleft" 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 2bd0d1a0fa..8c6ad5c0f7 100644 --- a/indra/newview/skins/default/xui/en/floater_test_button.xml +++ b/indra/newview/skins/default/xui/en/floater_test_button.xml @@ -23,7 +23,6 @@ name="bottom_delta_button" /> <button bottom_delta="30" - font="SansSerifSmall" height="23" label="SansSerifSmall" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/floater_test_line_editor.xml b/indra/newview/skins/default/xui/en/floater_test_line_editor.xml index e017d404c6..fe6ec91709 100644 --- a/indra/newview/skins/default/xui/en/floater_test_line_editor.xml +++ b/indra/newview/skins/default/xui/en/floater_test_line_editor.xml @@ -2,7 +2,7 @@ <floater legacy_header_height="18" can_resize="true" - height="400" + height="500" layout="topleft" name="floater_test_line_editor" help_topic="floater_test_line_editor" @@ -18,7 +18,18 @@ Enabled line editor </line_editor> <line_editor - enabled="false" + height="20" + layout="topleft" + left_delta="0" + name="ascii_line_editor" + prevalidate_callback="ascii" + tool_tip="ascii line editor" + top_pad="10" + width="200"> + ASCII only line editor + </line_editor> + <line_editor + enabled="false" height="20" layout="topleft" left_delta="0" @@ -51,6 +62,34 @@ width="200"> Disabled red-text line editor </line_editor> + <line_editor + height="20" + left_delta="0" + name="left_pad_editor" + text_pad_left="25" + top_pad="10" + width="200"> + 25 px left text padding + </line_editor> + <line_editor + height="20" + left_delta="0" + name="left_pad_editor" + text_pad_right="75" + top_pad="10" + width="200"> + 75 px right text padding + </line_editor> + <line_editor + height="20" + left_delta="0" + name="left_pad_editor" + text_pad_left="25" + text_pad_right="75" + top_pad="10" + width="200"> + 25 px left 75 px right text padding + </line_editor> <!-- "search_editor" is a specialized line_editor that shows read-only help text until the user clicks in the widget. --> <search_editor diff --git a/indra/newview/skins/default/xui/en/floater_test_list_view.xml b/indra/newview/skins/default/xui/en/floater_test_list_view.xml index 1d2086d9bc..247c705687 100644 --- a/indra/newview/skins/default/xui/en/floater_test_list_view.xml +++ b/indra/newview/skins/default/xui/en/floater_test_list_view.xml @@ -7,27 +7,5 @@ name="floater_test_list_view" help_topic="floater_test_list_view" width="400"> - <list_view - height="300" - left="10" - name="test_list_view" - top="28" - width="300" /> - <button - name="test_1_btn" - label="Test 1" - top="350" - left="10" - height="20" - width="80" - commit_callback.function="TestListView.Test1" /> - <button - name="test_2_btn" - label="Test 2" - top_delta="0" - left_pad="10" - height="20" - width="80" - commit_callback.function="TestListView.Test2" /> - + <!-- intentionally empty --> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_test_slider.xml b/indra/newview/skins/default/xui/en/floater_test_slider.xml index 86ff82e01f..85d8bb2bb1 100644 --- a/indra/newview/skins/default/xui/en/floater_test_slider.xml +++ b/indra/newview/skins/default/xui/en/floater_test_slider.xml @@ -2,7 +2,7 @@ <floater legacy_header_height="18" can_resize="true" - height="400" + height="500" layout="topleft" name="floater_test_slider" help_topic="floater_test_slider" @@ -84,4 +84,17 @@ name="red_slider" text_color="red" text_width="40" /> + <slider + width ="140" + bottom="490" + decimal_digits="1" + height="100" + left="20" + label="Red Slider Vertical" + label_width="100" + layout="topleft" + name="red_slider_vertical" + text_color="red" + orientation="vertical" + text_width="20" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml index 4679ae467d..113da9ea4d 100644 --- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml @@ -49,7 +49,6 @@ <button enabled="false" follows="left|bottom" - font="SansSerifSmall" height="20" label="Default" label_selected="Default" @@ -61,7 +60,6 @@ <button enabled="false" follows="left|bottom" - font="SansSerifSmall" height="20" label="None" label_selected="None" @@ -72,7 +70,6 @@ width="80" /> <button follows="left|bottom" - font="SansSerifSmall" height="20" label="Blank" label_selected="Blank" diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index b2f46bc433..636e9d465a 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -269,6 +269,7 @@ halign="left" left="13" name="RenderingCost" + tool_tip="Shows the rendering cost calculated for this object" top_pad="9" type="string" width="100"> @@ -306,6 +307,7 @@ layout="topleft" follows="left|top" name="combobox grid mode" + tool_tip="Choose the type of grid ruler for positioning the object" width="108"> <combo_box.item label="World grid" @@ -329,7 +331,7 @@ image_unselected="ForwardArrow_Off" layout="topleft" name="Options..." - tool_tip="Grid options" + tool_tip="See more grid options" top_delta="0" right="-10" width="18" @@ -699,7 +701,6 @@ </slider_bar> <button follows="left|top" - font="SansSerifSmall" height="19" label="Apply" label_selected="Apply" @@ -786,7 +787,7 @@ </panel.string> <panel.string name="text modify warning"> - This object has linked parts + You must select entire object to set permissions </panel.string> <panel.string name="Cost Default"> @@ -809,11 +810,8 @@ Mixed Sale </panel.string> <text - type="string" - length="1" follows="left|top" height="10" - layout="topleft" left="10" name="Name:" top="0" @@ -823,7 +821,6 @@ <line_editor follows="left|top|right" height="19" - layout="topleft" left_pad="0" max_length="63" name="Object Name" @@ -831,11 +828,8 @@ top_delta="0" width="170" /> <text - type="string" - length="1" follows="left|top" height="10" - layout="topleft" left="10" name="Description:" top_pad="3" @@ -845,7 +839,6 @@ <line_editor follows="left|top|right" height="19" - layout="topleft" left_pad="0" max_length="127" name="Object Description" @@ -933,7 +926,6 @@ width="150" /> <button follows="top|left" - font="SansSerifSmall" height="20" label="Deed" label_selected="Deed" @@ -974,23 +966,27 @@ <combo_box.item label="Touch (default)" name="Touch/grab(default)" - value="Touch/grab (default)" /> + value="Touch" /> <combo_box.item label="Sit on object" name="Sitonobject" - value="Sit on object" /> + value="Sit" /> <combo_box.item label="Buy object" name="Buyobject" - value="Buy object" /> + value="Buy" /> <combo_box.item label="Pay object" name="Payobject" - value="Pay object" /> + value="Pay" /> <combo_box.item label="Open" name="Open" value="Open" /> + <combo_box.item + label="Zoom" + name="Zoom" + value="Zoom" /> </combo_box> <check_box height="16" @@ -1074,7 +1070,7 @@ even though the user gets a free copy. follows="left|top|right" layout="topleft" name="perm_modify" - width="250"> + width="264"> You can modify this object </text> <text @@ -2608,7 +2604,6 @@ even though the user gets a free copy. width="170" /> <button follows="left|top" - font="SansSerifSmall" height="19" label="Apply" label_selected="Apply" @@ -2744,7 +2739,6 @@ even though the user gets a free copy. decouple_texture_size="true" /> <button follows="left|top" - font="SansSerifSmall" height="19" label="Align" label_selected="Align Media" diff --git a/indra/newview/skins/default/xui/en/floater_url_entry.xml b/indra/newview/skins/default/xui/en/floater_url_entry.xml index 1ab42cb140..29fb29fabf 100644 --- a/indra/newview/skins/default/xui/en/floater_url_entry.xml +++ b/indra/newview/skins/default/xui/en/floater_url_entry.xml @@ -32,7 +32,6 @@ <button follows="top|left" height="20" - font="SansSerifSmall" label="OK" layout="topleft" left="10" @@ -42,7 +41,6 @@ <button follows="top|left" height="20" - font="SansSerifSmall" label="Cancel" layout="topleft" left_pad="5" @@ -52,7 +50,6 @@ <button follows="top|right" height="20" - font="SansSerifSmall" label="Clear" layout="topleft" left_pad="65" diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml new file mode 100644 index 0000000000..4434fe7403 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml @@ -0,0 +1,100 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + can_resize="true" + height="300" + layout="topleft" + name="floater_voice_controls" + title="Voice Controls" + save_visibility="true" + single_instance="true" + width="282"> + <panel + bevel_style="in" + follows="left|right|top" + height="73" + layout="topleft" + left="0" + name="control_panel" + width="285"> + <panel + height="20" + layout="topleft" + left="10" + name="my_panel" + width="262"> + <avatar_icon + enabled="false" + follows="left|top" + height="18" + image_name="Generic_Person" + layout="topleft" + left="0" + name="user_icon" + top="0" + width="18" /> + <text + follows="top|left" + font="SansSerifSmallBold" + height="16" + layout="topleft" + left_pad="10" + name="user_text" + text_color="white" + top="4" + value="Mya Avatar:" + width="80" /> + </panel> + <layout_stack + bottom="10" + clip="false" + follows="left|right|top" + height="24" + layout="bottomleft" + orientation="horizontal" + width="262"> + <layout_panel + follows="left" + layout="topleft" + min_width="24" + top="0" + user_resize="false" + width="24"> + <icon + height="24" + image_name="Microphone_On" + layout="topleft" + name="Microphone_On" + top="0" + width="24" /> + </layout_panel> + <layout_panel + layout="topleft" + top="0" + user_resize="false" + width="258"> + <slider_bar + control_name="AudioLevelMic" + follows="left|right|top" + height="24" + increment="0.05" + layout="topleft" + left="0" + max_val="2" + name="volume_slider_bar" + tool_tip="Master Volume" + top="0" + value="0.75" + width="258" /> + </layout_panel> + </layout_stack> + </panel> + <avatar_list + follows="all" + height="197" + ignore_online_status="true" + layout="topleft" + left="0" + multi_select="true" + name="speakers_list" + width="282" /> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml index ef68d03a45..4ece0fa3ba 100644 --- a/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml +++ b/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml @@ -17,9 +17,9 @@ tool_tip="Enter a URL or URL pattern to White List" width="350" /> - <button follows="top|left" height="20" font="SansSerifSmall" label="OK" + <button follows="top|left" height="20" label="OK" layout="topleft" left="10" name="ok_btn" bottom_delta="28" width="64" /> - <button follows="top|left" height="20" font="SansSerifSmall" label="Cancel" + <button follows="top|left" height="20" label="Cancel" layout="topleft" left_pad="5" name="cancel_btn" bottom_delta="0" width="64" /> </floater> 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 387ffbd5b3..e3db0972ec 100644 --- a/indra/newview/skins/default/xui/en/floater_world_map.xml +++ b/indra/newview/skins/default/xui/en/floater_world_map.xml @@ -116,7 +116,6 @@ </text> <button follows="top|right" - font="SansSerifSmall" height="16" label="Go Home" label_selected="Go Home" @@ -340,6 +339,8 @@ label="Landmarks" name="item1" value="None" /> + <combo_box.commit_callback + function="WMap.Landmark"/> </combo_box> <icon color="0.5 0 0 1" diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml index 2c1e2b6dc0..dd3cf079db 100644 --- a/indra/newview/skins/default/xui/en/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml @@ -4,18 +4,18 @@ Single instance - only have one at a time, recycle it each spawn --> <floater - legacy_header_height="18" + legacy_header_height="25" bevel_style="in" - bg_opaque_image="Inspector_Background" + bg_opaque_image="Inspector_Background" can_close="false" can_minimize="false" - height="138" + height="148" layout="topleft" name="inspect_avatar" single_instance="true" sound_flags="0" visible="true" - width="245"> + width="228"> <!-- Allowed fields include: [BORN_ON] ("12/3/2008") [SL_PROFILE] (Second Life profile), @@ -30,7 +30,7 @@ </string> <string name="Details"> -[ACCTTYPE][COMMA] [PAYMENTINFO] +[SL_PROFILE] </string> <string name="Partner"> @@ -38,45 +38,45 @@ </string> <text follows="all" - font="SansSerifLargeBold" - height="18" + font="SansSerifLarge" + height="16" left="8" name="user_name" - top="5" - text_color="white" + top="10" + text_color="White" use_ellipses="true" value="Grumpity ProductEngine" - width="240" - word_wrap="false" /> + width="175" /> <text follows="all" height="16" left="8" - value="Grumpity ProductEngine moose moose" - name="user_details" - top_pad="0" - width="170" - use_ellipses="true" - word_wrap="false" /> - <text - follows="all" - font="SansSerifSmallBold" + name="user_subtitle" + font="SansSerifSmall" text_color="White" - height="18" + value="11 Months, 3 days old" + width="175" + use_ellipses="true" /> + <text + follows="all" + height="25" left="8" - name="user_subtitle" - use_ellipses="true" - top_pad="0" - width="170" /> + name="user_details" + word_wrap="true" + top_pad="6" + width="220">This is my second life description and I really think it is great. + </text> <text follows="all" - height="16" + height="13" left="8" name="user_partner" - top_pad="8" - width="240" + top_pad="3" + width="220" use_ellipses="true" - word_wrap="false" /> + word_wrap="false"> + Erica Linden + </text> <slider follows="top|left" height="23" @@ -89,15 +89,15 @@ tool_tip="Voice volume" top_pad="0" value="0.5" - width="150" /> + width="195" /> <button follows="all" height="16" - image_disabled="Inv_Sound" - image_disabled_selected="Inv_Sound" - image_hover_selected="Inv_Sound" - image_selected="Inv_Sound" - image_unselected="Inv_Sound" + image_disabled="Audio_Off" + image_disabled_selected="AudioMute_Off" + image_hover_selected="AudioMute_Over" + image_selected="AudioMute_Off" + image_unselected="Audio_Off" is_toggle="true" left_pad="0" top_delta="4" @@ -106,67 +106,60 @@ <avatar_icon follows="all" height="38" - right="-25" + right="-10" bevel_style="in" border_style="line" mouse_opaque="true" name="avatar_icon" - top="24" + top="10" width="38" /> - <button - follows="top|left" - height="18" - image_disabled="ForwardArrow_Disabled" - image_selected="ForwardArrow_Press" - image_unselected="ForwardArrow_Off" - layout="topleft" - name="view_profile_btn" - right="-8" - top="35" - left_delta="110" - tab_stop="false" - width="18" /> <!-- Overlapping buttons for default actions llinspectavatar.cpp makes visible the most likely default action --> <button follows="bottom|left" - height="23" + height="20" label="Add Friend" left="8" - top="246" + top="119" name="add_friend_btn" - width="100" /> + width="90" /> <button follows="bottom|left" - height="23" + height="20" label="IM" left_delta="0" top_delta="0" name="im_btn" - width="100" + width="80" commit_callback.function="InspectAvatar.IM" /> - <menu_button + <button follows="top|left" - height="18" - image_disabled="OptionsMenu_Disabled" - image_selected="OptionsMenu_Press" - image_unselected="OptionsMenu_Off" + height="20" + label="More" + layout="topleft" + name="view_profile_btn" + left_delta="96" + top_delta="0" + tab_stop="false" + width="80" /> + <!-- gear buttons here --> + <menu_button + height="20" + layout="topleft" + image_overlay="OptionsMenu_Off" menu_filename="menu_inspect_avatar_gear.xml" name="gear_btn" - right="-10" - top="249" - width="18" /> - <menu_button - visible="false" + right="-5" + top_delta="0" + width="35" /> + <menu_button follows="top|left" - height="18" - image_disabled="OptionsMenu_Disabled" - image_selected="OptionsMenu_Press" - image_unselected="OptionsMenu_Off" + height="20" + image_overlay="OptionsMenu_Off" menu_filename="menu_inspect_self_gear.xml" name="gear_self_btn" - right="-10" - top="249" - width="18" /> + right="-5" + top_delta="0" + width="35" /> </floater> diff --git a/indra/newview/skins/default/xui/en/inspect_object.xml b/indra/newview/skins/default/xui/en/inspect_object.xml index 1365a0483f..16f6e49092 100644 --- a/indra/newview/skins/default/xui/en/inspect_object.xml +++ b/indra/newview/skins/default/xui/en/inspect_object.xml @@ -4,81 +4,81 @@ Single instance - only have one at a time, recycle it each spawn --> <floater - legacy_header_height="18" + legacy_header_height="25" bevel_style="in" - bg_opaque_image="Inspector_Background" + bg_opaque_image="Inspector_Background" can_close="false" can_minimize="false" - height="145" + height="148" layout="topleft" name="inspect_object" single_instance="true" sound_flags="0" visible="true" - width="300"> + width="228"> <string name="Creator">By [CREATOR]</string> <string name="CreatorAndOwner"> by [CREATOR] owner [OWNER] </string> - <!-- *TODO: Might need to change to [AMOUNT] if icon contains "L$" --> <string name="Price">L$[AMOUNT]</string> <string name="PriceFree">Free!</string> <string name="Touch">Touch</string> <string name="Sit">Sit</string> <text follows="all" - font="SansSerifLargeBold" + font="SansSerifLarge" height="16" left="8" name="object_name" text_color="White" - top="5" + top="10" use_ellipses="true" value="Test Object Name That Is Really Long" - width="291" /> + width="220" /> <text follows="all" - font="SansSerif" - height="30" + height="33" left="8" name="object_creator" top_pad="0" use_ellipses="true" - width="275"> -by Longavatarname Johnsonlongstonnammer -owner James Linden + width="220"> + by secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about +owner secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about </text> <!-- *TODO: Replace this icon --> <icon name="price_icon" image_name="Icon_For_Sale" - left="7" + right="-5" width="16" height="16" - top="52" + top="56" follows="left|top" /> <text follows="all" - font="SansSerifSmallBold" + font="SansSerifSmall" + font.style="BOLD" height="16" - left_pad="5" + halign="right" + left="5" name="price_text" text_color="white" - top="54" + top="58" font_shadow="none" - width="150"> + width="196"> L$300,000 </text> <text follows="all" - height="30" + font="SansSerifSmall" + height="36" left="8" name="object_description" top_pad="0" - width="291" - use_ellipses="true" + width="220" word_wrap="true"> This is a really long description for an object being as how it is at least 80 characters in length and maybe more like 120 at this point. Who knows, really? </text> @@ -86,69 +86,64 @@ This is a really long description for an object being as how it is at least 80 c for sale, "Sit" if can sit, etc. --> <text follows="all" - height="15" + font="SansSerifSmall" + height="13" left_delta="0" name="object_media_url" - top_pad="-5" + top_pad="0" width="291" - max_length = "50" - use_ellipses="true" - word_wrap="true"/> - + max_length = "50" + use_ellipses="true"> + http://www.superdupertest.com +</text> <button follows="top|left" - font="SansSerif" height="20" label="Buy" - left="10" + left="8" name="buy_btn" - top="114" - width="75" /> + top="119" + width="80" /> <button follows="top|left" - font="SansSerif" height="20" label="Pay" left_delta="0" name="pay_btn" top_delta="0" - width="75" /> + width="80" /> <button follows="top|left" - font="SansSerif" - height="23" + height="20" label="Take Copy" left_delta="0" name="take_free_copy_btn" top_delta="0" - width="75" /> + width="80" /> <button follows="top|left" - font="SansSerifSmall" height="20" label="Touch" left_delta="0" name="touch_btn" top_delta="0" - width="75" /> + width="80" /> <button follows="top|left" - font="SansSerif" - height="23" + height="20" label="Sit" left_delta="0" name="sit_btn" top_delta="0" - width="75" /> + width="80" /> <button follows="top|left" - font="SansSerifSmall" height="20" label="Open" left_delta="0" name="open_btn" top_delta="0" - width="75" /> + width="80" /> <icon name="secure_browsing" image_name="Lock" @@ -156,33 +151,28 @@ This is a really long description for an object being as how it is at least 80 c visible="false" width="18" height="18" - top_delta="2" + top_delta="0" tool_tip="Secure Browsing" - follows="left|top"/> - + follows="left|top" /> + <!-- non-overlapping buttons here --> - <menu_button - follows="top|left" - height="18" - image_disabled="OptionsMenu_Disabled" - image_selected="OptionsMenu_Press" - image_unselected="OptionsMenu_Off" - menu_filename="menu_inspect_object_gear.xml" - name="gear_btn" - right="-10" - top_delta="5" - width="18" /> - <button + <button follows="top|left" - height="18" - image_disabled="ForwardArrow_Disabled" - image_selected="ForwardArrow_Press" - image_unselected="ForwardArrow_Off" + height="20" + label="More" layout="topleft" name="more_info_btn" - right="-5" - top="20" - left_delta="110" + left_delta="10" + top_delta="0" tab_stop="false" - width="18" /> + width="80" /> + <menu_button + follows="top|left" + height="20" + image_overlay="OptionsMenu_Off" + menu_filename="menu_inspect_object_gear.xml" + name="gear_btn" + right="-5" + top_delta="0" + width="35" /> </floater> 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 07c684d904..b5f2abf52a 100644 --- a/indra/newview/skins/default/xui/en/inspect_remote_object.xml +++ b/indra/newview/skins/default/xui/en/inspect_remote_object.xml @@ -71,7 +71,6 @@ </text> <button follows="top|left" - font="SansSerif" height="20" label="Map" left="10" @@ -80,7 +79,6 @@ width="75" /> <button follows="top|left" - font="SansSerif" height="20" label="Block" left_pad="5" @@ -89,7 +87,6 @@ width="75" /> <button follows="top|left" - font="SansSerif" height="20" label="Close" right="-10" diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml index 9e35c95d45..3bf7f50a2c 100644 --- a/indra/newview/skins/default/xui/en/main_view.xml +++ b/indra/newview/skins/default/xui/en/main_view.xml @@ -10,24 +10,24 @@ <layout_stack border_size="0" follows="all" mouse_opaque="false" - height="772" + height="768" name="menu_stack" orientation="vertical" top="0"> <layout_panel auto_resize="false" - min_height="19" - mouse_opaque="false" - name="status_bar_container" - height="19" - width="1024" - visible="false"/> - <layout_panel auto_resize="false" - height="65" + height="84" mouse_opaque="false" - name="nav_bar_container" + name="nav_and_status_bar_region" width="1024" - visible="false"/> - <panel auto_resize="true" + visible="false"> + <panel follows="left|right|bottom" + left="0" + name="nav_bar_container" + right="1024" + top="19" + height="65"/> + </layout_panel> + <layout_panel auto_resize="true" follows="all" height="500" layout="topleft" @@ -124,8 +124,16 @@ height="500" name="DebugView" width="1024"/> - </panel> + </layout_panel> </layout_stack> + <panel mouse_opaque="false" + follows="left|right|top" + name="status_bar_container" + height="19" + left="0" + top="0" + width="1024" + visible="false"/> <notify_box_view top="0" follows="all" height="768" diff --git a/indra/newview/skins/default/xui/en/menu_gesture_gear.xml b/indra/newview/skins/default/xui/en/menu_gesture_gear.xml new file mode 100644 index 0000000000..4642e82c0b --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_gesture_gear.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu + layout="topleft" + mouse_opaque="false" + name="menu_gesture_gear" + visible="false"> + <menu_item_call + font="SansSerifBold" + label="Add/Remove from Favorites" + layout="topleft" + name="activate"> + <on_click + function="Gesture.Action.ToogleActiveState" /> + </menu_item_call> + <menu_item_call + label="Copy" + layout="topleft" + name="copy_gesture"> + <on_click + function="Gesture.Action.CopyPast" + parameter="copy_gesture" /> + <on_enable + function="Gesture.EnableAction" + parameter="copy_gesture" /> + </menu_item_call> + <menu_item_call + label="Paste" + layout="topleft" + name="paste"> + <on_click + function="Gesture.Action.CopyPast" + parameter="paste" /> + <on_enable + function="Gesture.EnableAction" + parameter="paste" /> + </menu_item_call> + <menu_item_call + label="Copy UUID" + layout="topleft" + name="copy_uuid"> + <on_click + function="Gesture.Action.CopyPast" + parameter="copy_uuid" /> + <on_enable + function="Gesture.EnableAction" + parameter="copy_uuid" /> + </menu_item_call> + <menu_item_call + label="Save to current outfit" + layout="topleft" + name="save_to_outfit"> + <on_click + function="Gesture.Action.SaveToCOF" /> + </menu_item_call> + <menu_item_call + label="Edit" + layout="topleft" + name="edit_gesture"> + <on_click + function="Gesture.Action.ShowPreview" /> + <on_enable + function="Gesture.EnableAction" + parameter="edit_gesture" /> + </menu_item_call> + <menu_item_call + label="Inspect" + layout="topleft" + name="inspect"> + <on_click + function="Gesture.Action.ShowPreview" /> + <on_enable + function="Gesture.EnableAction" + parameter="inspect" /> + </menu_item_call> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/en/menu_imchiclet_group.xml index 542e319792..8cbe62cfb0 100644 --- a/indra/newview/skins/default/xui/en/menu_imchiclet_group.xml +++ b/indra/newview/skins/default/xui/en/menu_imchiclet_group.xml @@ -9,7 +9,15 @@ visible="false" width="128"> <menu_item_call - label="Chat..." + label="Group Info" + layout="topleft" + name="Show Profile"> + <menu_item_call.on_click + function="IMChicletMenu.Action" + parameter="info" /> + </menu_item_call> + <menu_item_call + label="Show Session" layout="topleft" name="Chat"> <menu_item_call.on_click @@ -17,11 +25,11 @@ parameter="group chat" /> </menu_item_call> <menu_item_call - label="Info..." + label="End Session" layout="topleft" - name="Show Profile"> + name="End Session"> <menu_item_call.on_click function="IMChicletMenu.Action" - parameter="info" /> + parameter="end" /> </menu_item_call> </menu> diff --git a/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml index c205868429..6891aaca32 100644 --- a/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml +++ b/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml @@ -9,7 +9,7 @@ visible="false" width="128"> <menu_item_call - label="Show Profile..." + label="Show Profile" layout="topleft" name="Show Profile"> <menu_item_call.on_click @@ -17,7 +17,15 @@ parameter="profile" /> </menu_item_call> <menu_item_call - label="Send IM..." + label="Add Friend" + layout="topleft" + name="Add Friend"> + <menu_item_call.on_click + function="IMChicletMenu.Action" + parameter="add" /> + </menu_item_call> + <menu_item_call + label="Show Session" layout="topleft" name="Send IM"> <menu_item_call.on_click @@ -25,11 +33,11 @@ parameter="im" /> </menu_item_call> <menu_item_call - label="Add Friend..." + label="End Session" layout="topleft" - name="Add Friend"> + name="End Session"> <menu_item_call.on_click function="IMChicletMenu.Action" - parameter="add" /> + parameter="end" /> </menu_item_call> </menu> diff --git a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml index 590621062c..ef0bf72058 100644 --- a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml @@ -1,103 +1,105 @@ -<?xml version="1.0" encoding="utf-8"?>
-<menu
- create_jump_keys="true"
- layout="topleft"
- mouse_opaque="false"
- visible="false"
- name="Gear Menu">
- <menu_item_call
- label="View Profile"
- enabled="true"
- name="view_profile">
- <menu_item_call.on_click
- function="InspectAvatar.ViewProfile"/>
- </menu_item_call>
- <menu_item_call
- label="Add Friend"
- name="add_friend">
- <menu_item_call.on_click
- function="InspectAvatar.AddFriend"/>
- </menu_item_call>
- <menu_item_call
- label="IM"
- name="im">
- <menu_item_call.on_click
- function="InspectAvatar.IM"/>
- </menu_item_call>
- <menu_item_call
- label="Call"
- enabled="true"
- name="call">
- </menu_item_call>
- <menu_item_call
- label="Teleport"
- name="teleport">
- <menu_item_call.on_click
- function="InspectAvatar.Teleport"/>
- </menu_item_call>
- <menu_item_call
- label="Invite to Group"
- name="invite_to_group">
- <menu_item_call.on_click
- function="InspectAvatar.InviteToGroup"/>
- </menu_item_call>
- <menu_item_separator />
- <menu_item_call
- label="Block"
- name="block">
- <menu_item_call.on_click
- function="InspectAvatar.Block"/>
- </menu_item_call>
- <menu_item_call
- label="Report"
- name="report">
- <menu_item_call.on_click
- function="InspectAvatar.Report"/>
- </menu_item_call>
- <menu_item_call
- label="Freeze"
- name="freeze">
- <menu_item_call.on_click
- function="InspectAvatar.Freeze"/>
- <menu_item_call.on_visible
- function="InspectAvatar.VisibleFreezeEject"/>
- </menu_item_call>
- <menu_item_call
- label="Eject"
- name="eject">
- <menu_item_call.on_click
- function="InspectAvatar.Eject"/>
- <menu_item_call.on_visible
- function="InspectAvatar.VisibleFreezeEject"/>
- </menu_item_call>
- <menu_item_call
- label="Debug"
- name="debug">
- <menu_item_call.on_click
- function="Avatar.Debug"/>
- <menu_item_call.on_visible
- function="IsGodCustomerService"/>
- </menu_item_call>
- <menu_item_call
- label="Find On Map"
- name="find_on_map">
- <menu_item_call.on_click
- function="InspectAvatar.FindOnMap"/>
- <menu_item_call.on_visible
- function="InspectAvatar.VisibleFindOnMap"/>
- </menu_item_call>
- <menu_item_call
- label="Zoom In"
- name="zoom_in">
- <menu_item_call.on_click
- function="InspectAvatar.ZoomIn"/>
- <menu_item_call.on_visible
- function="InspectAvatar.VisibleZoomIn"/>
- </menu_item_call>
- <menu_item_call
- label="Pay"
- name="pay">
- <menu_item_call.on_click
- function="InspectAvatar.Pay"/>
- </menu_item_call>
-</menu>
+<?xml version="1.0" encoding="utf-8"?> +<menu + create_jump_keys="true" + layout="topleft" + mouse_opaque="false" + visible="false" + name="Gear Menu"> + <menu_item_call + label="View Profile" + enabled="true" + name="view_profile"> + <menu_item_call.on_click + function="InspectAvatar.ViewProfile"/> + </menu_item_call> + <menu_item_call + label="Add Friend" + name="add_friend"> + <menu_item_call.on_click + function="InspectAvatar.AddFriend"/> + <menu_item_call.on_enable + function="InspectAvatar.Gear.Enable"/> + </menu_item_call> + <menu_item_call + label="IM" + name="im"> + <menu_item_call.on_click + function="InspectAvatar.IM"/> + </menu_item_call> + <menu_item_call + label="Call" + enabled="true" + name="call"> + </menu_item_call> + <menu_item_call + label="Teleport" + name="teleport"> + <menu_item_call.on_click + function="InspectAvatar.Teleport"/> + </menu_item_call> + <menu_item_call + label="Invite to Group" + name="invite_to_group"> + <menu_item_call.on_click + function="InspectAvatar.InviteToGroup"/> + </menu_item_call> + <menu_item_separator /> + <menu_item_call + label="Block" + name="block"> + <menu_item_call.on_click + function="InspectAvatar.Block"/> + </menu_item_call> + <menu_item_call + label="Report" + name="report"> + <menu_item_call.on_click + function="InspectAvatar.Report"/> + </menu_item_call> + <menu_item_call + label="Freeze" + name="freeze"> + <menu_item_call.on_click + function="InspectAvatar.Freeze"/> + <menu_item_call.on_visible + function="InspectAvatar.VisibleFreezeEject"/> + </menu_item_call> + <menu_item_call + label="Eject" + name="eject"> + <menu_item_call.on_click + function="InspectAvatar.Eject"/> + <menu_item_call.on_visible + function="InspectAvatar.VisibleFreezeEject"/> + </menu_item_call> + <menu_item_call + label="Debug" + name="debug"> + <menu_item_call.on_click + function="Avatar.Debug"/> + <menu_item_call.on_visible + function="IsGodCustomerService"/> + </menu_item_call> + <menu_item_call + label="Find On Map" + name="find_on_map"> + <menu_item_call.on_click + function="InspectAvatar.FindOnMap"/> + <menu_item_call.on_visible + function="InspectAvatar.VisibleFindOnMap"/> + </menu_item_call> + <menu_item_call + label="Zoom In" + name="zoom_in"> + <menu_item_call.on_click + function="InspectAvatar.ZoomIn"/> + <menu_item_call.on_visible + function="InspectAvatar.VisibleZoomIn"/> + </menu_item_call> + <menu_item_call + label="Pay" + name="pay"> + <menu_item_call.on_click + function="InspectAvatar.Pay"/> + </menu_item_call> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index 8b6ab4e4d8..b65a49eaed 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory.xml @@ -356,9 +356,9 @@ parameter="restore" /> </menu_item_call> <menu_item_call - label="Goto Link" + label="Find Original" layout="topleft" - name="Goto Link"> + name="Find Original"> <menu_item_call.on_click function="Inventory.DoToSelected" parameter="goto" /> @@ -434,9 +434,9 @@ <menu_item_separator layout="topleft" /> <menu_item_call - label="Take Off Items" + label="Remove From Outfit" layout="topleft" - name="Take Off Items"> + name="Remove From Outfit"> <menu_item_call.on_click function="Inventory.DoToSelected" parameter="removefromoutfit" /> diff --git a/indra/newview/skins/default/xui/en/menu_mini_map.xml b/indra/newview/skins/default/xui/en/menu_mini_map.xml index 5cbbd71bfe..8d0edf018d 100644 --- a/indra/newview/skins/default/xui/en/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/en/menu_mini_map.xml @@ -10,7 +10,6 @@ width="128"> <menu_item_call label="Zoom Close" - layout="topleft" name="Zoom Close"> <menu_item_call.on_click function="Minimap.Zoom" @@ -18,7 +17,6 @@ </menu_item_call> <menu_item_call label="Zoom Medium" - layout="topleft" name="Zoom Medium"> <menu_item_call.on_click function="Minimap.Zoom" @@ -26,29 +24,31 @@ </menu_item_call> <menu_item_call label="Zoom Far" - layout="topleft" name="Zoom Far"> <menu_item_call.on_click function="Minimap.Zoom" parameter="far" /> </menu_item_call> - <menu_item_separator - layout="topleft" - name="Tracking Separator" /> + <menu_item_check + label="Rotate Map" + name="Rotate Map"> + <menu_item_check.on_check + control="MiniMapRotate" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="MiniMapRotate" /> + </menu_item_check> + <menu_item_separator /> <menu_item_call label="Stop Tracking" - layout="topleft" name="Stop Tracking"> <menu_item_call.on_click function="Minimap.Tracker" parameter="task_properties" /> </menu_item_call> - <menu_item_separator - layout="topleft" - name="Tracking Separator" /> + <menu_item_separator /> <menu_item_call label="World Map" - layout="topleft" name="World Map"> <menu_item_call.on_click function="ShowFloater" diff --git a/indra/newview/skins/default/xui/en/menu_navbar.xml b/indra/newview/skins/default/xui/en/menu_navbar.xml index 89469fb013..e17eeb46f6 100644 --- a/indra/newview/skins/default/xui/en/menu_navbar.xml +++ b/indra/newview/skins/default/xui/en/menu_navbar.xml @@ -10,7 +10,6 @@ width="128"> <menu_item_check label="Show Coordinates" - layout="topleft" name="Show Coordinates"> <menu_item_check.on_click function="Navbar.Action" @@ -19,22 +18,28 @@ function="Navbar.EnableMenuItem" parameter="show_coordinates" /> </menu_item_check> + <menu_item_check + label="Show Parcel Properties" + name="Show Parcel Properties"> + <menu_item_check.on_click + function="Navbar.Action" + parameter="show_properties" /> + <menu_item_check.on_check + control="NavBarShowParcelProperties" /> + </menu_item_check> <!-- Label of 'Landmark' item is changing in runtime, see AddLandmarkNavBarMenu/EditLandmarkNavBarMenu in strings.xml --> <menu_item_call label="Landmark" - layout="topleft" name="Landmark"> <menu_item_call.on_click function="Navbar.Action" parameter="landmark" /> </menu_item_call> <menu_item_separator - layout="topleft" name="Separator" /> <menu_item_call label="Cut" - layout="topleft" name="Cut"> <menu_item_call.on_click function="Navbar.Action" @@ -45,7 +50,6 @@ </menu_item_call> <menu_item_call label="Copy" - layout="topleft" name="Copy"> <menu_item_call.on_click function="Navbar.Action" @@ -56,7 +60,6 @@ </menu_item_call> <menu_item_call label="Paste" - layout="topleft" name="Paste"> <menu_item_call.on_click function="Navbar.Action" @@ -67,7 +70,6 @@ </menu_item_call> <menu_item_call label="Delete" - layout="topleft" name="Delete"> <menu_item_call.on_click function="Navbar.Action" @@ -78,7 +80,6 @@ </menu_item_call> <menu_item_call label="Select All" - layout="topleft" name="Select All"> <menu_item_call.on_click function="Navbar.Action" diff --git a/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml index 6dd44255bf..304492bedb 100644 --- a/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml +++ b/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml @@ -13,15 +13,11 @@ function="CheckControl" parameter="GroupListShowIcons" /> </menu_item_check> - <menu_item_check + <menu_item_call label="Leave Selected Group" layout="topleft" name="Leave Selected Group"> - <menu_item_check.on_click - function="People.Groups.ViewSort.Action" - parameter="show_icons" /> - <menu_item_check.on_check - function="CheckControl" - parameter="GroupListShowIcons" /> - </menu_item_check> + <menu_item_call.on_click + function="People.Group.Minus.Action"/> + </menu_item_call> </menu> diff --git a/indra/newview/skins/default/xui/en/menu_profile_overflow.xml b/indra/newview/skins/default/xui/en/menu_profile_overflow.xml new file mode 100644 index 0000000000..d0128d1c9a --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_profile_overflow.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<toggleable_menu + height="50" + layout="topleft" + mouse_opaque="false" + name="profile_overflow_menu" + width="120"> + <menu_item_call + label="Pay" + layout="topleft" + name="pay"> + <menu_item_call.on_click + function="Profile.Pay" /> + </menu_item_call> + <menu_item_call + label="Share" + layout="topleft" + name="share"> + <menu_item_call.on_click + function="Profile.Share" /> + </menu_item_call> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/menu_url_inventory.xml b/indra/newview/skins/default/xui/en/menu_url_inventory.xml new file mode 100644 index 0000000000..cf9d1d5881 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_url_inventory.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + layout="topleft" + name="Url Popup"> + <menu_item_call + label="Show Inventory Item" + layout="topleft" + name="show_item"> + <menu_item_call.on_click + function="Url.Execute" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Copy Name to clipboard" + layout="topleft" + name="url_copy_label"> + <menu_item_call.on_click + function="Url.CopyLabel" /> + </menu_item_call> + <menu_item_call + label="Copy SLurl to clipboard" + layout="topleft" + name="url_copy"> + <menu_item_call.on_click + function="Url.CopyUrl" /> + </menu_item_call> +</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 e98a6d57bb..ae8a1599a9 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -1,3698 +1,3720 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu_bar
- bg_visible="false"
- follows="left|top|right"
- layout="topleft"
- name="Main Menu">
- <menu
- label="Me"
- layout="topleft"
- name="Me"
- tear_off="true">
- <menu_item_call
- label="Preferences"
- layout="topleft"
- name="Preferences"
- shortcut="control|P">
- <menu_item_call.on_click
- function="Floater.Show"
- parameter="preferences" />
- </menu_item_call>
- <menu_item_call
- label="My Dashboard"
- layout="topleft"
- 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$"
- layout="topleft"
- name="Buy and Sell L$">
- <menu_item_call.on_click
- function="ShowFloater"
- parameter="buy currency" />
- </menu_item_call>
- <menu_item_separator
- layout="topleft" />
- <menu_item_call
- label="My Profile"
- layout="topleft"
- name="Profile">
- <menu_item_call.on_click
- function="ShowAgentProfile"
- parameter="agent" />
- </menu_item_call>
- <menu_item_call
- label="My Appearance"
- layout="topleft"
- name="Appearance">
- <menu_item_call.on_click
- function="ShowFloater"
- parameter="appearance" />
- <menu_item_call.on_enable
- function="Edit.EnableCustomizeAvatar" />
- </menu_item_call>
- <menu_item_check
- label="My Inventory"
- layout="topleft"
- name="Inventory"
- shortcut="control|I">
- <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="My Gestures"
- layout="topleft"
- name="Gestures"
- shortcut="control|G">
- <menu_item_call.on_click
- function="ShowFloater"
- parameter="gestures" />
- </menu_item_call>
- <menu
- label="My Status"
- layout="topleft"
- name="Status"
- tear_off="true">
- <menu_item_call
- label="Away"
- layout="topleft"
- name="Set Away">
- <menu_item_call.on_click
- function="World.SetAway" />
- </menu_item_call>
- <menu_item_separator
- layout="topleft"/>
- <menu_item_call
- label="Busy"
- layout="topleft"
- name="Set Busy">
- <menu_item_call.on_click
- function="World.SetBusy"/>
- </menu_item_call>
- </menu>
- <menu_item_call
- label="Request Admin Status"
- layout="topleft"
- 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"
- layout="topleft"
- 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
- layout="topleft" />
- <menu_item_call
- label="Quit [APP_NAME]"
- layout="topleft"
- name="Quit"
- shortcut="control|Q">
- <menu_item_call.on_click
- function="File.Quit" />
- </menu_item_call>
- </menu>
- <menu
- label="Communicate"
- layout="topleft"
- name="Communicate"
- tear_off="true">
- <menu_item_call
- label="My Friends"
- layout="topleft"
- name="My Friends"
- shortcut="control|shift|F">
- <menu_item_call.on_click
- function="SideTray.PanelPeopleTab"
- parameter="friends_panel" />
- </menu_item_call>
- <menu_item_call
- label="My Groups"
- layout="topleft"
- name="My Groups">
- <menu_item_call.on_click
- function="SideTray.PanelPeopleTab"
- parameter="groups_panel" />
- </menu_item_call>
- <menu_item_separator
- layout="topleft" />
- <!--menu_item_call
- label="Chat"
- layout="topleft"
- name="Chat">
- <menu_item_call.on_click
- function="World.Chat" />
- </menu_item_call-->
- <menu_item_check
- label="Nearby Chat"
- layout="topleft"
- name="Nearby Chat"
- shortcut="control|H">
- <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"
- layout="topleft"
- 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 Media"
- layout="topleft"
- name="Nearby Media"
- shortcut="control|alt|N">
- <menu_item_check.on_check
- function="Floater.Visible"
- parameter="nearby_media" />
- <menu_item_check.on_click
- function="Floater.Toggle"
- parameter="nearby_media" />
- </menu_item_check>
- <!--menu_item_check
- label="Block List"
- layout="topleft"
- name="Mute List">
- <menu_item_check.on_check
- function="Floater.Visible"
- parameter="mute" />
- <menu_item_check.on_click
- function="Floater.Toggle"
- parameter="mute" />
- </menu_item_check-->
- <menu_item_separator
- layout="topleft" />
- <menu_item_check
- label="(Legacy) Communicate"
- layout="topleft"
- name="Instant Message"
- shortcut="control|T">
- <menu_item_check.on_check
- function="Floater.Visible"
- parameter="communicate" />
- <menu_item_check.on_click
- function="Floater.Toggle"
- parameter="communicate" />
- </menu_item_check>
- <menu_item_call
- label="(Temp) Media Remote Ctrl"
- layout="topleft"
- name="Preferences"
- shortcut="control|alt|M">
- <menu_item_call.on_click
- function="Floater.Toggle"
- parameter="media_remote_ctrl" />
- </menu_item_call>
- </menu>
- <menu
- label="World"
- layout="topleft"
- name="World"
- tear_off="true">
- <menu_item_check
- label="Move"
- layout="topleft"
- name="Movement Controls">
- <menu_item_check.on_check
- function="Floater.Visible"
- parameter="moveview" />
- <menu_item_check.on_click
- function="Floater.Toggle"
- parameter="moveview" />
- </menu_item_check>
- <menu_item_check
- label="View"
- layout="topleft"
- name="Camera Controls">
- <menu_item_check.on_check
- function="Floater.Visible"
- parameter="camera" />
- <menu_item_check.on_click
- function="Floater.Toggle"
- parameter="camera" />
- </menu_item_check>
- <menu_item_separator
- layout="topleft" />
- <menu_item_call
- label="About Land"
- layout="topleft"
- name="About Land">
- <menu_item_call.on_click
- function="Floater.Show"
- parameter="about_land" />
- </menu_item_call>
- <menu_item_call
- label="Region/Estate"
- layout="topleft"
- name="Region/Estate">
- <menu_item_call.on_click
- function="Floater.Show"
- parameter="region_info" />
- </menu_item_call>
- <menu_item_call
- label="Buy Land"
- layout="topleft"
- name="Buy Land">
- <menu_item_call.on_click
- function="ShowFloater"
- parameter="buy land" />
- <menu_item_call.on_enable
- function="World.EnableBuyLand" />
- </menu_item_call>
- <menu_item_call
- label="My Land"
- layout="topleft"
- name="My Land">
- <menu_item_call.on_click
- function="ShowFloater"
- parameter="land_holdings" />
- </menu_item_call>
- <menu
- create_jump_keys="true"
- label="Show"
- layout="topleft"
- name="Land"
- tear_off="true">
- <menu_item_check
- label="Ban Lines"
- layout="topleft"
- name="Ban Lines">
- <menu_item_check.on_check
- control="ShowBanLines" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="ShowBanLines" />
- </menu_item_check>
- <menu_item_check
- label="Beacons"
- layout="topleft"
- name="beacons"
- shortcut="control|alt|shift|N">
- <menu_item_check.on_check
- function="Floater.Visible"
- parameter="beacons" />
- <menu_item_check.on_click
- function="Floater.Toggle"
- parameter="beacons" />
- </menu_item_check>
- <menu_item_check
- label="Property Lines"
- layout="topleft"
- name="Property Lines"
- shortcut="control|alt|shift|P">
- <menu_item_check.on_check
- control="ShowPropertyLines" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="ShowPropertyLines" />
- </menu_item_check>
- <menu_item_check
- label="Land Owners"
- layout="topleft"
- name="Land Owners">
- <menu_item_check.on_check
- control="ShowParcelOwners" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="ShowParcelOwners" />
- </menu_item_check>
- </menu>
- <menu_item_separator
- layout="topleft" />
- <menu
- label="Landmarks"
- layout="topleft"
- name="Landmarks"
- tear_off="true">
- <menu_item_call
- label="Create Landmark Here"
- layout="topleft"
- 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="Set Home to Here"
- layout="topleft"
- 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_call
- label="Teleport Home"
- layout="topleft"
- 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>
- <menu_item_check
- label="Mini-Map"
- layout="topleft"
- 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"
- layout="topleft"
- name="World Map"
- shortcut="control|M"
- use_mac_ctrl="true">
- <menu_item_check.on_check
- function="Floater.Visible"
- parameter="world_map" />
- <menu_item_check.on_click
- function="Floater.Toggle"
- parameter="world_map" />
- </menu_item_check>
- <!-- <menu_item_check
- label="Show Navigation Bar"
- layout="topleft"
- name="ShowNavbarNavigationPanel">
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="ShowNavbarNavigationPanel" />
- <menu_item_check.on_check
- function="CheckControl"
- parameter="ShowNavbarNavigationPanel" />
- </menu_item_check>
- <menu_item_check
- label="Show Favorites Bar"
- layout="topleft"
- name="ShowNavbarFavoritesPanel">
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="ShowNavbarFavoritesPanel" />
- <menu_item_check.on_check
- function="CheckControl"
- parameter="ShowNavbarFavoritesPanel" />
- </menu_item_check>
- <menu_item_separator
- layout="topleft" />-->
- <menu_item_call
- label="Snapshot"
- layout="topleft"
- name="Take Snapshot"
- shortcut="control|shift|S">
- <menu_item_call.on_click
- function="Floater.Show"
- parameter="snapshot" />
- </menu_item_call>
- <menu
- create_jump_keys="true"
- label="Sun"
- layout="topleft"
- name="Environment Settings"
- tear_off="true">
- <menu_item_call
- label="Sunrise"
- layout="topleft"
- name="Sunrise">
- <menu_item_call.on_click
- function="World.EnvSettings"
- parameter="sunrise" />
- </menu_item_call>
- <menu_item_call
- label="Midday"
- layout="topleft"
- name="Noon"
- shortcut="control|shift|Y">
- <menu_item_call.on_click
- function="World.EnvSettings"
- parameter="noon" />
- </menu_item_call>
- <menu_item_call
- label="Sunset"
- layout="topleft"
- name="Sunset"
- shortcut="control|shift|N">
- <menu_item_call.on_click
- function="World.EnvSettings"
- parameter="sunset" />
- </menu_item_call>
- <menu_item_call
- label="Midnight"
- layout="topleft"
- name="Midnight">
- <menu_item_call.on_click
- function="World.EnvSettings"
- parameter="midnight" />
- </menu_item_call>
- <menu_item_call
- label="Use the Estate Time"
- layout="topleft"
- name="Revert to Region Default">
- <menu_item_call.on_click
- function="World.EnvSettings"
- parameter="default" />
- </menu_item_call>
- <menu_item_separator
- layout="topleft" />
- <menu_item_call
- label="Environment Editor"
- layout="topleft"
- name="Environment Editor">
- <menu_item_call.on_click
- function="World.EnvSettings"
- parameter="editor" />
- </menu_item_call>
- </menu>
- </menu>
- <menu
- create_jump_keys="true"
- label="Build"
- layout="topleft"
- name="BuildTools"
- tear_off="true"
- visible="true">
- <menu_item_check
- label="Build"
- layout="topleft"
- name="Show Build Tools"
- shortcut="control|B">
- <menu_item_check.on_check
- function="Build.Active" />
- <menu_item_check.on_click
- function="Build.Toggle" />
- <menu_item_check.on_enable
- function="Build.Enabled" />
- </menu_item_check>
- <menu
- create_jump_keys="true"
- label="Select Build Tool"
- layout="topleft"
- name="Select Tool"
- tear_off="true">
- <menu_item_call
- label="Focus Tool"
- layout="topleft"
- name="Focus"
- shortcut="control|1">
- <menu_item_call.on_click
- function="Tools.SelectTool"
- parameter="focus" />
- </menu_item_call>
- <menu_item_call
- label="Move Tool"
- layout="topleft"
- name="Move"
- shortcut="control|2">
- <menu_item_call.on_click
- function="Tools.SelectTool"
- parameter="move" />
- </menu_item_call>
- <menu_item_call
- label="Edit Tool"
- layout="topleft"
- name="Edit"
- shortcut="control|3">
- <menu_item_call.on_click
- function="Tools.SelectTool"
- parameter="edit" />
- </menu_item_call>
- <menu_item_call
- label="Create Tool"
- layout="topleft"
- name="Create"
- shortcut="control|4">
- <menu_item_call.on_click
- function="Tools.SelectTool"
- parameter="create" />
- </menu_item_call>
- <menu_item_call
- label="Land Tool"
- layout="topleft"
- name="Land"
- shortcut="control|5">
- <menu_item_call.on_click
- function="Tools.SelectTool"
- parameter="land" />
- </menu_item_call>
- </menu>
- <menu
- create_jump_keys="true"
- label="Edit"
- layout="topleft"
- name="Edit"
- tear_off="true">
- <menu_item_call
- label="Undo"
- layout="topleft"
- name="Undo"
- shortcut="control|Z">
- <menu_item_call.on_click
- function="Edit.Undo" />
- <menu_item_call.on_enable
- function="Edit.EnableUndo" />
- </menu_item_call>
- <menu_item_call
- label="Redo"
- layout="topleft"
- name="Redo"
- shortcut="control|Y">
- <menu_item_call.on_click
- function="Edit.Redo" />
- <menu_item_call.on_enable
- function="Edit.EnableRedo" />
- </menu_item_call>
- <menu_item_separator
- layout="topleft" />
- <menu_item_call
- label="Cut"
- layout="topleft"
- name="Cut"
- shortcut="control|X">
- <menu_item_call.on_click
- function="Edit.Cut" />
- <menu_item_call.on_enable
- function="Edit.EnableCut" />
- </menu_item_call>
- <menu_item_call
- label="Copy"
- layout="topleft"
- name="Copy"
- shortcut="control|C">
- <menu_item_call.on_click
- function="Edit.Copy" />
- <menu_item_call.on_enable
- function="Edit.EnableCopy" />
- </menu_item_call>
- <menu_item_call
- label="Paste"
- layout="topleft"
- name="Paste"
- shortcut="control|V">
- <menu_item_call.on_click
- function="Edit.Paste" />
- <menu_item_call.on_enable
- function="Edit.EnablePaste" />
- </menu_item_call>
- <menu_item_call
- label="Delete"
- layout="topleft"
- name="Delete"
- shortcut="Del">
- <menu_item_call.on_click
- function="Edit.Delete" />
- <menu_item_call.on_enable
- function="Edit.EnableDelete" />
- </menu_item_call>
- <menu_item_call
- label="Duplicate"
- layout="topleft"
- name="Duplicate"
- shortcut="control|D">
- <menu_item_call.on_click
- function="Edit.Duplicate" />
- <menu_item_call.on_enable
- function="Edit.EnableDuplicate" />
- </menu_item_call>
- <menu_item_separator
- layout="topleft" />
- <menu_item_call
- label="Select All"
- layout="topleft"
- name="Select All"
- shortcut="control|A">
- <menu_item_call.on_click
- function="Edit.SelectAll" />
- <menu_item_call.on_enable
- function="Edit.EnableSelectAll" />
- </menu_item_call>
- <menu_item_call
- label="Deselect"
- layout="topleft"
- name="Deselect"
- shortcut="control|E">
- <menu_item_call.on_click
- function="Edit.Deselect" />
- <menu_item_call.on_enable
- function="Edit.EnableDeselect" />
- </menu_item_call>
- </menu>
- <menu_item_separator
- layout="topleft" />
- <menu_item_call
- label="Link"
- layout="topleft"
- name="Link"
- shortcut="control|L">
- <menu_item_call.on_click
- function="Tools.Link" />
- <menu_item_call.on_enable
- function="Tools.EnableLink" />
- </menu_item_call>
- <menu_item_call
- label="Unlink"
- layout="topleft"
- name="Unlink"
- shortcut="control|shift|L">
- <menu_item_call.on_click
- function="Tools.Unlink" />
- <menu_item_call.on_enable
- function="Tools.EnableUnlink" />
- </menu_item_call>
- <menu_item_separator
- layout="topleft" />
- <menu_item_call
- label="Focus on Selection"
- layout="topleft"
- name="Focus on Selection"
- shortcut="H">
- <menu_item_call.on_click
- function="Tools.LookAtSelection"
- parameter="focus" />
- <menu_item_call.on_enable
- function="Tools.SomethingSelectedNoHUD" />
- </menu_item_call>
- <menu_item_call
- label="Zoom to Selection"
- layout="topleft"
- name="Zoom to Selection"
- shortcut="shift|H">
- <menu_item_call.on_click
- function="Tools.LookAtSelection"
- parameter="zoom" />
- <menu_item_call.on_enable
- function="Tools.SomethingSelectedNoHUD" />
- </menu_item_call>
- <menu_item_separator
- layout="topleft" />
- <menu
- create_jump_keys="true"
- label="Object"
- layout="topleft"
- name="Object"
- tear_off="true">
- <menu_item_call
- label="Buy"
- layout="topleft"
- name="Menu Object Take"
- visible="true">
- <menu_item_call.on_click
- function="Tools.BuyOrTake" />
- <menu_item_call.on_enable
- function="Tools.EnableBuyOrTake"
- name="EnableBuyOrTake"
- parameter="Buy,Take" />
- </menu_item_call>
- <menu_item_call
- label="Take Copy"
- layout="topleft"
- name="Take Copy">
- <menu_item_call.on_click
- function="Tools.TakeCopy" />
- <menu_item_call.on_enable
- function="Tools.EnableTakeCopy" />
- </menu_item_call>
- <menu_item_call
- label="Save Back to My Inventory"
- layout="topleft"
- name="Save Object Back to My Inventory">
- <menu_item_call.on_click
- function="Tools.SaveToInventory" />
- <menu_item_call.on_enable
- function="Tools.EnableSaveToInventory" />
- </menu_item_call>
- <menu_item_call
- label="Save Back to Object Contents"
- layout="topleft"
- name="Save Object Back to Object Contents">
- <menu_item_call.on_click
- function="Tools.SaveToObjectInventory" />
- <menu_item_call.on_enable
- function="Tools.EnableSaveToObjectInventory" />
- </menu_item_call>
- </menu>
- <menu
- create_jump_keys="true"
- label="Scripts"
- layout="topleft"
- name="Scripts"
- tear_off="true">
- <menu_item_call
- label="Recompile Scripts (Mono)"
- layout="topleft"
- name="Mono">
- <menu_item_call.on_click
- function="Tools.SelectedScriptAction"
- parameter="compile mono" />
- <menu_item_call.on_enable
- function="EditableSelectedMono" />
- </menu_item_call>
- <menu_item_call
- label="Recompile Scripts (LSL)"
- layout="topleft"
- name="LSL">
- <menu_item_call.on_click
- function="Tools.SelectedScriptAction"
- parameter="compile lsl" />
- <menu_item_call.on_enable
- function="EditableSelected" />
- </menu_item_call>
- <menu_item_call
- label="Reset Scripts"
- layout="topleft"
- name="Reset Scripts">
- <menu_item_call.on_click
- function="Tools.SelectedScriptAction"
- parameter="reset" />
- <menu_item_call.on_enable
- function="EditableSelected" />
- </menu_item_call>
- <menu_item_call
- label="Set Scripts to Running"
- layout="topleft"
- name="Set Scripts to Running">
- <menu_item_call.on_click
- function="Tools.SelectedScriptAction"
- parameter="start" />
- <menu_item_call.on_enable
- function="EditableSelected" />
- </menu_item_call>
- <menu_item_call
- label="Set Scripts to Not Running"
- layout="topleft"
- name="Set Scripts to Not Running">
- <menu_item_call.on_click
- function="Tools.SelectedScriptAction"
- parameter="stop" />
- <menu_item_call.on_enable
- function="EditableSelected" />
- </menu_item_call>
- </menu>
- <menu_item_separator
- layout="topleft" />
- <menu
- create_jump_keys="true"
- label="Options"
- layout="topleft"
- name="Options"
- tear_off="true">
- <menu_item_check
- label="Edit Linked Parts"
- layout="topleft"
- name="Edit Linked Parts">
- <menu_item_check.on_check
- control="EditLinkedParts" />
- <menu_item_check.on_click
- function="Tools.EditLinkedParts"
- parameter="EditLinkedParts" />
- <menu_item_check.on_enable
- function="Tools.EnableToolNotPie" />
- </menu_item_check>
- <menu_item_call
- label="Set Default Upload Permissions"
- layout="topleft"
- name="perm prefs">
- <menu_item_call.on_click
- function="Floater.Toggle"
- parameter="perm_prefs" />
- </menu_item_call>
- <menu_item_check
- label="Show Advanced Permissions"
- layout="topleft"
- name="DebugPermissions">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="DebugPermissions" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="DebugPermissions" />
- </menu_item_check>
- <!--menu_item_call
- label="Show Script Warning/Error Window"
- layout="topleft"
- name="Show Script Warning/Error Window">
- <menu_item_call.on_click
- function="ShowFloater"
- parameter="script errors" />
- </menu_item_call-->
- <menu_item_separator
- layout="topleft" />
- <menu
- create_jump_keys="true"
- label="Selection"
- layout="topleft"
- name="Selection"
- tear_off="true">
- <menu_item_check
- label="Select Only My Objects"
- layout="topleft"
- name="Select Only My Objects">
- <menu_item_check.on_check
- control="SelectOwnedOnly" />
- <menu_item_check.on_click
- function="Tools.SelectOnlyMyObjects"
- parameter="agents" />
- </menu_item_check>
- <menu_item_check
- label="Select Only Movable Objects"
- layout="topleft"
- name="Select Only Movable Objects">
- <menu_item_check.on_check
- control="SelectMovableOnly" />
- <menu_item_check.on_click
- function="Tools.SelectOnlyMovableObjects"
- parameter="movable" />
- </menu_item_check>
- <menu_item_check
- label="Select By Surrounding"
- layout="topleft"
- name="Select By Surrounding">
- <menu_item_check.on_check
- control="RectangleSelectInclusive" />
- <menu_item_check.on_click
- function="Tools.SelectBySurrounding" />
- </menu_item_check>
- </menu>
- <menu
- create_jump_keys="true"
- label="Show"
- layout="topleft"
- name="Show"
- tear_off="true">
- <menu_item_check
- label="Show Hidden Selection"
- layout="topleft"
- name="Show Hidden Selection">
- <menu_item_check.on_check
- control="RenderHiddenSelections" />
- <menu_item_check.on_click
- function="Tools.ShowHiddenSelection" />
- </menu_item_check>
- <menu_item_check
- label="Show Light Radius for Selection"
- layout="topleft"
- name="Show Light Radius for Selection">
- <menu_item_check.on_check
- control="RenderLightRadius" />
- <menu_item_check.on_click
- function="Tools.ShowSelectionLightRadius" />
- </menu_item_check>
- <menu_item_check
- label="Show Selection Beam"
- layout="topleft"
- name="Show Selection Beam">
- <menu_item_check.on_check
- control="ShowSelectionBeam" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="ShowSelectionBeam" />
- </menu_item_check>
- </menu>
- <menu
- create_jump_keys="true"
- label="Grid"
- layout="topleft"
- name="Grid"
- tear_off="true">
- <menu_item_check
- label="Snap to Grid"
- layout="topleft"
- name="Snap to Grid"
- shortcut="G">
- <menu_item_check.on_check
- control="SnapEnabled" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="SnapEnabled" />
- <menu_item_check.on_enable
- function="Tools.EnableToolNotPie" />
- </menu_item_check>
- <menu_item_call
- label="Snap Object XY to Grid"
- layout="topleft"
- name="Snap Object XY to Grid"
- shortcut="shift|X">
- <menu_item_call.on_click
- function="Tools.SnapObjectXY" />
- <menu_item_call.on_enable
- function="Tools.EnableToolNotPie" />
- </menu_item_call>
- <menu_item_call
- label="Use Selection for Grid"
- layout="topleft"
- name="Use Selection for Grid"
- shortcut="shift|G">
- <menu_item_call.on_click
- function="Tools.UseSelectionForGrid" />
- <menu_item_call.on_enable
- function="SomethingSelected" />
- </menu_item_call>
- <menu_item_call
- label="Grid Options"
- layout="topleft"
- name="Grid Options"
- shortcut="control|shift|B">
- <menu_item_call.on_click
- function="Floater.Show"
- parameter="build_options" />
- <menu_item_call.on_enable
- function="Tools.EnableToolNotPie" />
- </menu_item_call>
- </menu>
- </menu>
- <menu
- create_jump_keys="true"
- label="Select Linked Parts"
- layout="topleft"
- name="Select Linked Parts"
- tear_off="true">
- <menu_item_call
- label="Select Next Part"
- layout="topleft"
- name="Select Next Part"
- shortcut="control|.">
- <menu_item_call.on_click
- function="Tools.SelectNextPart"
- parameter="next" />
- <menu_item_call.on_enable
- function="Tools.EnableSelectNextPart" />
- </menu_item_call>
- <menu_item_call
- label="Select Previous Part"
- layout="topleft"
- name="Select Previous Part"
- shortcut="control|,">
- <menu_item_call.on_click
- function="Tools.SelectNextPart"
- parameter="previous" />
- <menu_item_call.on_enable
- function="Tools.EnableSelectNextPart" />
- </menu_item_call>
- <menu_item_call
- label="Include Next Part"
- layout="topleft"
- name="Include Next Part"
- shortcut="control|shift|.">
- <menu_item_call.on_click
- function="Tools.SelectNextPart"
- parameter="includenext" />
- <menu_item_call.on_enable
- function="Tools.EnableSelectNextPart" />
- </menu_item_call>
- <menu_item_call
- label="Include Previous Part"
- layout="topleft"
- name="Include Previous Part"
- shortcut="control|shift|,">
- <menu_item_call.on_click
- function="Tools.SelectNextPart"
- parameter="includeprevious" />
- <menu_item_call.on_enable
- function="Tools.EnableSelectNextPart" />
- </menu_item_call>
- </menu>
- </menu>
- <menu
- label="Help"
- layout="topleft"
- name="Help"
- tear_off="true">
- <menu_item_call
- label="[SECOND_LIFE] Help"
- layout="topleft"
- name="Second Life Help"
- shortcut="F1">
- <menu_item_call.on_click
- function="ShowFloater"
- parameter="help f1" />
- </menu_item_call>
- <menu_item_call
- label="Tutorial"
- layout="topleft"
- name="Tutorial">
- <menu_item_call.on_click
- function="Floater.Show"
- parameter="hud" />
- </menu_item_call>
- <menu_item_separator
- layout="topleft" />
- <menu_item_call
- label="Report Abuse"
- layout="topleft"
- name="Report Abuse">
- <menu_item_call.on_click
- function="ShowFloater"
- parameter="complaint reporter" />
- </menu_item_call>
- <menu_item_separator
- layout="topleft" />
- <menu_item_call
- label="About [APP_NAME]"
- layout="topleft"
- name="About Second Life">
- <menu_item_call.on_click
- function="Floater.Show"
- parameter="sl_about" />
- </menu_item_call>
- </menu>
- <menu
- label="Advanced"
- layout="topleft"
- name="Advanced"
- tear_off="true"
- visible="false">
- <menu_item_check
- label="Set Away After 30 Minutes"
- layout="topleft"
- name="Go Away/AFK When Idle">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="AllowIdleAFK" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="AllowIdleAFK" />
- </menu_item_check>
- <menu_item_call
- label="Stop Animating Me"
- layout="topleft"
- name="Stop Animating My Avatar">
- <menu_item_call.on_click
- function="Tools.StopAllAnimations" />
- </menu_item_call>
- <menu_item_call
- label="Rebake Textures"
- layout="topleft"
- name="Rebake Texture"
- shortcut="control|alt|R">
- <menu_item_call.on_click
- function="Advanced.RebakeTextures" />
- </menu_item_call>
- <menu_item_call
- label="Set UI Size to Default"
- layout="topleft"
- name="Set UI Size to Default">
- <menu_item_call.on_click
- function="View.DefaultUISize" />
- </menu_item_call>
- <menu_item_separator/>
- <menu_item_check
- label="Limit Select Distance"
- layout="topleft"
- name="Limit Select Distance">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="LimitSelectDistance" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="LimitSelectDistance" />
- </menu_item_check>
- <menu_item_check
- label="Disable Camera Constraints"
- layout="topleft"
- name="Disable Camera Distance">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="DisableCameraConstraints" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="DisableCameraConstraints" />
- </menu_item_check>
- <menu_item_separator
- layout="topleft" />
- <menu_item_check
- label="High-res Snapshot"
- layout="topleft"
- name="HighResSnapshot">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="HighResSnapshot" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="HighResSnapshot" />
- </menu_item_check>
- <menu_item_check
- label="Quiet Snapshots to Disk"
- layout="topleft"
- name="QuietSnapshotsToDisk">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="QuietSnapshotsToDisk" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="QuietSnapshotsToDisk" />
- </menu_item_check>
- <menu_item_check
- label="Compress Snapshots to Disk"
- layout="topleft"
- name="CompressSnapshotsToDisk">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="CompressSnapshotsToDisk" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="CompressSnapshotsToDisk" />
- </menu_item_check>
- <menu_item_call
- label="Save Texture As"
- layout="topleft"
- name="Save Texture As">
- <menu_item_call.on_click
- function="File.SaveTexture" />
- <menu_item_call.on_enable
- function="File.EnableSaveAs" />
- </menu_item_call>
- <menu_item_separator
- layout="topleft" />
- <menu
- create_jump_keys="true"
- label="Performance Tools"
- layout="topleft"
- name="Performance Tools"
- tear_off="true">
- <menu_item_call
- label="Lag Meter"
- layout="topleft"
- name="Lag Meter">
- <menu_item_call.on_click
- function="Floater.Show"
- parameter="lagmeter" />
- </menu_item_call>
- <menu_item_check
- label="Statistics Bar"
- layout="topleft"
- name="Statistics Bar"
- shortcut="control|shift|1">
- <menu_item_check.on_check
- function="Floater.Visible"
- parameter="stats" />
- <menu_item_check.on_click
- function="Floater.Toggle"
- parameter="stats" />
- </menu_item_check>
- <menu_item_check
- label="Show Avatar Rendering Cost"
- layout="topleft"
- name="Avatar Rendering Cost">
- <menu_item_check.on_check
- function="Advanced.CheckInfoDisplay"
- parameter="shame" />
- <menu_item_check.on_click
- function="Advanced.ToggleInfoDisplay"
- parameter="shame" />
- </menu_item_check>
- </menu>
- <menu
- create_jump_keys="true"
- label="Highlighting and Visibility"
- layout="topleft"
- name="Highlighting and Visibility"
- tear_off="true">
- <menu_item_check
- label="Cheesy Beacon"
- layout="topleft"
- name="Cheesy Beacon">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="CheesyBeacon" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="CheesyBeacon" />
- </menu_item_check>
- <menu_item_check
- label="Hide Particles"
- layout="topleft"
- name="Hide Particles"
- shortcut="control|alt|shift|=">
- <menu_item_check.on_check
- function="View.CheckRenderType"
- parameter="hideparticles" />
- <menu_item_check.on_click
- function="View.ToggleRenderType"
- parameter="hideparticles" />
- </menu_item_check>
- <menu_item_check
- label="Hide Selected"
- layout="topleft"
- name="Hide Selected">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="HideSelectedObjects" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="HideSelectedObjects" />
- </menu_item_check>
- <menu_item_check
- label="Highlight Transparent"
- layout="topleft"
- name="Highlight Transparent"
- shortcut="control|alt|T">
- <menu_item_check.on_check
- function="View.CheckHighlightTransparent" />
- <menu_item_check.on_click
- function="View.HighlightTransparent" />
- </menu_item_check>
- <menu_item_check
- label="Show HUD Attachments"
- layout="topleft"
- name="Show HUD Attachments"
- shortcut="alt|shift|H">
- <menu_item_check.on_check
- function="View.CheckHUDAttachments" />
- <menu_item_check.on_click
- function="View.ShowHUDAttachments" />
- </menu_item_check>
- <menu_item_check
- label="Show Mouselook Crosshairs"
- layout="topleft"
- name="ShowCrosshairs">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="ShowCrosshairs" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="ShowCrosshairs" />
- </menu_item_check>
- <!-- <menu
- create_jump_keys="true"
- label="Hover Tips"
- layout="topleft"
- name="Hover Tips"
- tear_off="true">
- <menu_item_check
- label="Show Tips"
- layout="topleft"
- name="Show Tips"
- shortcut="control|shift|T">
- <menu_item_check.on_check
- function="View.CheckShowHoverTips" />
- <menu_item_check.on_click
- function="View.ShowHoverTips" />
- </menu_item_check>
- <menu_item_separator
- layout="topleft" />-->
- <menu_item_check
- label="Show Land Tooltips"
- layout="topleft"
- name="Land Tips">
- <menu_item_check.on_check
- control="ShowLandHoverTip" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="ShowLandHoverTip" />
- <menu_item_check.on_enable
- function="View.CheckShowHoverTips" />
- </menu_item_check>
- <!-- <menu_item_check
- label="Show Tips On All Objects"
- layout="topleft"
- name="Tips On All Objects">
- <menu_item_check.on_check
- control="ShowAllObjectHoverTip" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="ShowAllObjectHoverTip" />
- <menu_item_check.on_enable
- function="View.CheckShowHoverTips" />
- </menu_item_check>
- </menu>-->
-
- </menu>
-
- <menu
- create_jump_keys="true"
- label="Rendering Types"
- layout="topleft"
- name="Rendering Types"
- tear_off="true">
- <menu_item_check
- label="Simple"
- layout="topleft"
- name="Simple"
- shortcut="control|alt|shift|1">
- <menu_item_check.on_check
- function="Advanced.CheckRenderType"
- parameter="simple" />
- <menu_item_check.on_click
- function="Advanced.ToggleRenderType"
- parameter="simple" />
- </menu_item_check>
- <menu_item_check
- label="Alpha"
- layout="topleft"
- name="Alpha"
- shortcut="control|alt|shift|2">
- <menu_item_check.on_check
- function="Advanced.CheckRenderType"
- parameter="alpha" />
- <menu_item_check.on_click
- function="Advanced.ToggleRenderType"
- parameter="alpha" />
- </menu_item_check>
- <menu_item_check
- label="Tree"
- layout="topleft"
- name="Tree"
- shortcut="control|alt|shift|3">
- <menu_item_check.on_check
- function="Advanced.CheckRenderType"
- parameter="tree" />
- <menu_item_check.on_click
- function="Advanced.ToggleRenderType"
- parameter="tree" />
- </menu_item_check>
- <menu_item_check
- label="Avatars"
- layout="topleft"
- name="Character"
- shortcut="control|alt|shift|4">
- <menu_item_check.on_check
- function="Advanced.CheckRenderType"
- parameter="character" />
- <menu_item_check.on_click
- function="Advanced.ToggleRenderType"
- parameter="character" />
- </menu_item_check>
- <menu_item_check
- label="SurfacePath"
- layout="topleft"
- name="SurfacePath"
- shortcut="control|alt|shift|5">
- <menu_item_check.on_check
- function="Advanced.CheckRenderType"
- parameter="surfacePath" />
- <menu_item_check.on_click
- function="Advanced.ToggleRenderType"
- parameter="surfacePath" />
- </menu_item_check>
- <menu_item_check
- label="Sky"
- layout="topleft"
- name="Sky"
- shortcut="control|alt|shift|6">
- <menu_item_check.on_check
- function="Advanced.CheckRenderType"
- parameter="sky" />
- <menu_item_check.on_click
- function="Advanced.ToggleRenderType"
- parameter="sky" />
- </menu_item_check>
- <menu_item_check
- label="Water"
- layout="topleft"
- name="Water"
- shortcut="control|alt|shift|7">
- <menu_item_check.on_check
- function="Advanced.CheckRenderType"
- parameter="water" />
- <menu_item_check.on_click
- function="Advanced.ToggleRenderType"
- parameter="water" />
- </menu_item_check>
- <menu_item_check
- label="Ground"
- layout="topleft"
- name="Ground"
- shortcut="control|alt|shift|8">
- <menu_item_check.on_check
- function="Advanced.CheckRenderType"
- parameter="ground" />
- <menu_item_check.on_click
- function="Advanced.ToggleRenderType"
- parameter="ground" />
- </menu_item_check>
- <menu_item_check
- label="Volume"
- layout="topleft"
- name="Volume"
- shortcut="control|alt|shift|9">
- <menu_item_check.on_check
- function="Advanced.CheckRenderType"
- parameter="volume" />
- <menu_item_check.on_click
- function="Advanced.ToggleRenderType"
- parameter="volume" />
- </menu_item_check>
- <menu_item_check
- label="Grass"
- layout="topleft"
- name="Grass"
- shortcut="control|alt|shift|0">
- <menu_item_check.on_check
- function="Advanced.CheckRenderType"
- parameter="grass" />
- <menu_item_check.on_click
- function="Advanced.ToggleRenderType"
- parameter="grass" />
- </menu_item_check>
- <menu_item_check
- label="Clouds"
- layout="topleft"
- name="Clouds"
- shortcut="control|alt|shift|-">
- <menu_item_check.on_check
- function="Advanced.CheckRenderType"
- parameter="clouds" />
- <menu_item_check.on_click
- function="Advanced.ToggleRenderType"
- parameter="clouds" />
- </menu_item_check>
- <menu_item_check
- label="Particles"
- layout="topleft"
- name="Particles"
- shortcut="control|alt|shift|=">
- <menu_item_check.on_check
- function="Advanced.CheckRenderType"
- parameter="particles" />
- <menu_item_check.on_click
- function="Advanced.ToggleRenderType"
- parameter="particles" />
- </menu_item_check>
- <menu_item_check
- label="Bump"
- layout="topleft"
- name="Bump"
- shortcut="control|alt|shift|\">
- <menu_item_check.on_check
- function="Advanced.CheckRenderType"
- parameter="bump" />
- <menu_item_check.on_click
- function="Advanced.ToggleRenderType"
- parameter="bump" />
- </menu_item_check>
- </menu>
- <menu
- create_jump_keys="true"
- label="Rendering Features"
- layout="topleft"
- name="Rendering Features"
- tear_off="true">
- <menu_item_check
- label="UI"
- layout="topleft"
- name="UI"
- shortcut="control|alt|F1">
- <menu_item_check.on_check
- function="Advanced.CheckFeature"
- parameter="ui" />
- <menu_item_check.on_click
- function="Advanced.ToggleFeature"
- parameter="ui" />
- </menu_item_check>
- <menu_item_check
- label="Selected"
- layout="topleft"
- name="Selected"
- shortcut="control|alt|F2">
- <menu_item_check.on_check
- function="Advanced.CheckFeature"
- parameter="selected" />
- <menu_item_check.on_click
- function="Advanced.ToggleFeature"
- parameter="selected" />
- </menu_item_check>
- <menu_item_check
- label="Highlighted"
- layout="topleft"
- name="Highlighted"
- shortcut="control|alt|F3">
- <menu_item_check.on_check
- function="Advanced.CheckFeature"
- parameter="highlighted" />
- <menu_item_check.on_click
- function="Advanced.ToggleFeature"
- parameter="highlighted" />
- </menu_item_check>
- <menu_item_check
- label="Dynamic Textures"
- layout="topleft"
- name="Dynamic Textures"
- shortcut="control|alt|F4">
- <menu_item_check.on_check
- function="Advanced.CheckFeature"
- parameter="dynamic textures" />
- <menu_item_check.on_click
- function="Advanced.ToggleFeature"
- parameter="dynamic textures" />
- </menu_item_check>
- <menu_item_check
- label="Foot Shadows"
- layout="topleft"
- name="Foot Shadows"
- shortcut="control|alt|F5">
- <menu_item_check.on_check
- function="Advanced.CheckFeature"
- parameter="foot shadows" />
- <menu_item_check.on_click
- function="Advanced.ToggleFeature"
- parameter="foot shadows" />
- </menu_item_check>
- <menu_item_check
- label="Fog"
- layout="topleft"
- name="Fog"
- shortcut="control|alt|F6">
- <menu_item_check.on_check
- function="Advanced.CheckFeature"
- parameter="fog" />
- <menu_item_check.on_click
- function="Advanced.ToggleFeature"
- parameter="fog" />
- </menu_item_check>
- <menu_item_check
- label="Test FRInfo"
- layout="topleft"
- name="Test FRInfo"
- shortcut="control|alt|F8">
- <menu_item_check.on_check
- function="Advanced.CheckFeature"
- parameter="fr info" />
- <menu_item_check.on_click
- function="Advanced.ToggleFeature"
- parameter="fr info" />
- </menu_item_check>
- <menu_item_check
- label="Flexible Objects"
- layout="topleft"
- name="Flexible Objects"
- shortcut="control|alt|F9">
- <menu_item_check.on_check
- function="Advanced.CheckFeature"
- parameter="flexible" />
- <menu_item_check.on_click
- function="Advanced.ToggleFeature"
- parameter="flexible" />
- </menu_item_check>
- </menu>
- <menu_item_check
- label="Run Multiple Threads"
- layout="topleft"
- name="Run Multiple Threads">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="RunMultipleThreads" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="RunMultipleThreads" />
- </menu_item_check>
- <menu_item_call
- label="Clear Group Cache"
- layout="topleft"
- name="ClearGroupCache">
- <menu_item_call.on_click
- function="Advanced.ClearGroupCache"
- parameter="ClearGroupCache" />
- </menu_item_call>
- <menu_item_check
- label="Mouse Smoothing"
- layout="topleft"
- name="Mouse Smoothing">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="MouseSmooth" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="MouseSmooth" />
- </menu_item_check>
- <menu_item_separator
- layout="topleft" />
- <menu
- label="Shortcuts"
- layout="topleft"
- name="Shortcuts"
- tear_off="true"
- visible="false">
- <menu_item_check
- label="Search"
- layout="topleft"
- name="Search"
- shortcut="control|F">
- <menu_item_check.on_check
- function="Floater.Visible"
- parameter="search" />
- <menu_item_check.on_click
- function="Floater.Toggle"
- parameter="search" />
- </menu_item_check>
- <menu_item_call
- enabled="false"
- label="Release Keys"
- layout="topleft"
- 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"
- layout="topleft"
- name="Set UI Size to Default">
- <menu_item_call.on_click
- function="View.DefaultUISize" />
- </menu_item_call>
- <menu_item_separator
- layout="topleft" />
- <menu_item_check
- label="Always Run"
- layout="topleft"
- 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_check
- label="Fly"
- layout="topleft"
- name="Fly"
- shortcut="Home">
- <menu_item_check.on_click
- function="Agent.toggleFlying" />
- <menu_item_check.on_enable
- function="Agent.enableFlying" />
- </menu_item_check>
- <menu_item_separator
- layout="topleft" />
- <menu_item_call
- label="Close Window"
- layout="topleft"
- name="Close Window"
- shortcut="control|W">
- <menu_item_call.on_click
- function="File.CloseWindow" />
- <menu_item_call.on_enable
- function="File.EnableCloseWindow" />
- </menu_item_call>
- <menu_item_call
- label="Close All Windows"
- layout="topleft"
- name="Close All Windows"
- shortcut="control|shift|W">
- <menu_item_call.on_click
- function="File.CloseAllWindows" />
- <menu_item_call.on_enable
- function="File.EnableCloseAllWindows" />
- </menu_item_call>
- <menu_item_separator
- layout="topleft" />
- <menu_item_call
- label="Snapshot to Disk"
- layout="topleft"
- name="Snapshot to Disk"
- shortcut="control|`"
- use_mac_ctrl="true">
- <menu_item_call.on_click
- function="File.TakeSnapshotToDisk" />
- </menu_item_call>
- <menu_item_separator
- layout="topleft" />
- <menu_item_call
- label="Mouselook"
- layout="topleft"
- name="Mouselook"
- shortcut="M">
- <menu_item_call.on_click
- function="View.Mouselook" />
- <menu_item_call.on_enable
- function="View.EnableMouselook" />
- </menu_item_call>
- <menu_item_check
- label="Joystick Flycam"
- layout="topleft"
- name="Joystick Flycam"
- shortcut="alt|shift|F">
- <menu_item_check.on_check
- function="View.CheckJoystickFlycam" />
- <menu_item_check.on_click
- function="View.JoystickFlycam" />
- <menu_item_check.on_enable
- function="View.EnableJoystickFlycam" />
- </menu_item_check>
- <menu_item_call
- label="Reset View"
- layout="topleft"
- name="Reset View"
- shortcut="Esc">
- <menu_item_call.on_click
- function="View.ResetView" />
- </menu_item_call>
- <menu_item_call
- label="Look at Last Chatter"
- layout="topleft"
- name="Look at Last Chatter"
- shortcut="control|\">
- <menu_item_call.on_click
- function="View.LookAtLastChatter" />
- <menu_item_call.on_enable
- function="View.EnableLastChatter" />
- </menu_item_call>
- <menu_item_separator
- layout="topleft" />
- <menu
- create_jump_keys="true"
- label="Select Build Tool"
- layout="topleft"
- name="Select Tool"
- tear_off="true">
- <menu_item_call
- label="Focus Tool"
- layout="topleft"
- name="Focus"
- shortcut="control|1">
- <menu_item_call.on_click
- function="Tools.SelectTool"
- parameter="focus" />
- </menu_item_call>
- <menu_item_call
- label="Move Tool"
- layout="topleft"
- name="Move"
- shortcut="control|2">
- <menu_item_call.on_click
- function="Tools.SelectTool"
- parameter="move" />
- </menu_item_call>
- <menu_item_call
- label="Edit Tool"
- layout="topleft"
- name="Edit"
- shortcut="control|3">
- <menu_item_call.on_click
- function="Tools.SelectTool"
- parameter="edit" />
- </menu_item_call>
- <menu_item_call
- label="Create Tool"
- layout="topleft"
- name="Create"
- shortcut="control|4">
- <menu_item_call.on_click
- function="Tools.SelectTool"
- parameter="create" />
- </menu_item_call>
- <menu_item_call
- label="Land Tool"
- layout="topleft"
- name="Land"
- shortcut="control|5">
- <menu_item_call.on_click
- function="Tools.SelectTool"
- parameter="land" />
- </menu_item_call>
- </menu>
- <menu_item_separator
- layout="topleft" />
- <menu_item_call
- label="Zoom In"
- layout="topleft"
- name="Zoom In"
- shortcut="control|0">
- <menu_item_call.on_click
- function="View.ZoomIn" />
- </menu_item_call>
- <menu_item_call
- label="Zoom Default"
- layout="topleft"
- name="Zoom Default"
- shortcut="control|9">
- <menu_item_call.on_click
- function="View.ZoomDefault" />
- </menu_item_call>
- <menu_item_call
- label="Zoom Out"
- layout="topleft"
- name="Zoom Out"
- shortcut="control|8">
- <menu_item_call.on_click
- function="View.ZoomOut" />
- </menu_item_call>
- <menu_item_separator
- layout="topleft" />
- <menu_item_call
- label="Toggle Fullscreen"
- layout="topleft"
- name="Toggle Fullscreen"
- >
- <!-- Note: shortcut="alt|Enter" was deleted from the preceding node-->
- <menu_item_call.on_click
- function="View.Fullscreen" />
- </menu_item_call>
- </menu>
- <menu_item_separator
- layout="topleft" />
- <menu_item_call
- label="Show Debug Settings"
- layout="topleft"
- name="Debug Settings">
- <menu_item_call.on_click
- function="Advanced.ShowDebugSettings"
- parameter="all" />
- </menu_item_call>
- <menu_item_check
- label="Show Develop Menu"
- layout="topleft"
- name="Debug Mode"
- shortcut="control|alt|Q">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="QAMode" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="QAMode" />
- </menu_item_check>
- </menu>
- <menu
- create_jump_keys="true"
- label="Develop"
- layout="topleft"
- name="Develop"
- tear_off="true"
- visible="false">
- <menu
- create_jump_keys="true"
- label="Consoles"
- layout="topleft"
- name="Consoles"
- tear_off="true">
- <menu_item_check
- label="Texture Console"
- layout="topleft"
- name="Texture Console"
- shortcut="control|shift|3"
- use_mac_ctrl="true">
- <menu_item_check.on_check
- function="Advanced.CheckConsole"
- parameter="texture" />
- <menu_item_check.on_click
- function="Advanced.ToggleConsole"
- parameter="texture" />
- </menu_item_check>
- <menu_item_check
- label="Debug Console"
- layout="topleft"
- name="Debug Console"
- shortcut="control|shift|4"
- use_mac_ctrl="true">
- <menu_item_check.on_check
- function="Advanced.CheckConsole"
- parameter="debug" />
- <menu_item_check.on_click
- function="Advanced.ToggleConsole"
- parameter="debug" />
- </menu_item_check>
- <menu_item_call
- label="Notifications Console"
- layout="topleft"
- name="Notifications"
- shortcut="control|shift|5">
- <menu_item_call.on_click
- function="Floater.Toggle"
- parameter="notifications_console" />
- </menu_item_call>
- <menu_item_check
- label="Texture Size Console"
- layout="topleft"
- name="Texture Size"
- shortcut="control|shift|6">
- <menu_item_check.on_check
- function="Advanced.CheckConsole"
- parameter="texture size" />
- <menu_item_check.on_click
- function="Advanced.ToggleConsole"
- parameter="texture size" />
- </menu_item_check>
- <menu_item_check
- label="Texture Category Console"
- layout="topleft"
- name="Texture Category"
- shortcut="control|shift|7">
- <menu_item_check.on_check
- function="Advanced.CheckConsole"
- parameter="texture category" />
- <menu_item_check.on_click
- function="Advanced.ToggleConsole"
- parameter="texture category" />
- </menu_item_check>
- <menu_item_check
- label="Fast Timers"
- layout="topleft"
- name="Fast Timers"
- shortcut="control|shift|9"
- use_mac_ctrl="true">
- <menu_item_check.on_check
- function="Advanced.CheckConsole"
- parameter="fast timers" />
- <menu_item_check.on_click
- function="Advanced.ToggleConsole"
- parameter="fast timers" />
- </menu_item_check>
- <menu_item_check
- label="Memory"
- layout="topleft"
- name="Memory"
- shortcut="control|shift|0"
- use_mac_ctrl="true">
- <menu_item_check.on_check
- function="Advanced.CheckConsole"
- parameter="memory view" />
- <menu_item_check.on_click
- function="Advanced.ToggleConsole"
- parameter="memory view" />
- </menu_item_check>
- <menu_item_separator
- layout="topleft" />
- <menu_item_call
- label="Region Info to Debug Console"
- layout="topleft"
- name="Region Info to Debug Console">
- <menu_item_call.on_click
- function="Advanced.DumpInfoToConsole"
- parameter="region" />
- </menu_item_call>
- <menu_item_call
- label="Group Info to Debug Console"
- layout="topleft"
- name="Group Info to Debug Console">
- <menu_item_call.on_click
- function="Advanced.DumpInfoToConsole"
- parameter="group" />
- </menu_item_call>
- <menu_item_call
- label="Capabilities Info to Debug Console"
- layout="topleft"
- name="Capabilities Info to Debug Console">
- <menu_item_call.on_click
- function="Advanced.DumpInfoToConsole"
- parameter="capabilities" />
- </menu_item_call>
- <menu_item_separator
- layout="topleft" />
- <menu_item_check
- label="Camera"
- layout="topleft"
- name="Camera">
- <menu_item_check.on_check
- function="Advanced.CheckHUDInfo"
- parameter="camera" />
- <menu_item_check.on_click
- function="Advanced.ToggleHUDInfo"
- parameter="camera" />
- </menu_item_check>
- <menu_item_check
- label="Wind"
- layout="topleft"
- name="Wind">
- <menu_item_check.on_check
- function="Advanced.CheckHUDInfo"
- parameter="wind" />
- <menu_item_check.on_click
- function="Advanced.ToggleHUDInfo"
- parameter="wind" />
- </menu_item_check>
- <menu_item_check
- label="FOV"
- layout="topleft"
- name="FOV">
- <menu_item_check.on_check
- function="Advanced.CheckHUDInfo"
- parameter="fov" />
- <menu_item_check.on_click
- function="Advanced.ToggleHUDInfo"
- parameter="fov" />
- </menu_item_check>
- </menu>
- <menu
- create_jump_keys="true"
- label="Show Info"
- layout="topleft"
- name="Display Info"
- tear_off="true">
- <menu_item_check
- label="Show Time"
- layout="topleft"
- name="Show Time">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="DebugShowTime" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="DebugShowTime" />
- </menu_item_check>
- <menu_item_check
- label="Show Render Info"
- layout="topleft"
- name="Show Render Info">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="DebugShowRenderInfo" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="DebugShowRenderInfo" />
- </menu_item_check>
- <menu_item_check
- label="Show Matrices"
- layout="topleft"
- name="Show Matrices">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="DebugShowRenderMatrices" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="DebugShowRenderMatrices" />
- </menu_item_check>
- <menu_item_check
- label="Show Color Under Cursor"
- layout="topleft"
- name="Show Color Under Cursor">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="DebugShowColor" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="DebugShowColor" />
- </menu_item_check>
- <menu_item_separator
- layout="topleft" />
- <menu_item_check
- label="Show Updates to Objects"
- layout="topleft"
- name="Show Updates"
- shortcut="control|alt|shift|U">
- <menu_item_check.on_check
- function="Advanced.CheckShowObjectUpdates"
- parameter="ObjectUpdates" />
- <menu_item_check.on_click
- function="Advanced.ToggleShowObjectUpdates" />
- </menu_item_check>
- </menu>
- <menu_item_separator
- layout="topleft" />
- <menu
- create_jump_keys="true"
- label="Force an Error"
- layout="topleft"
- name="Force Errors"
- tear_off="true">
- <menu_item_call
- label="Force Breakpoint"
- layout="topleft"
- name="Force Breakpoint"
- shortcut="control|alt|shift|B">
- <menu_item_call.on_click
- function="Advanced.ForceErrorBreakpoint" />
- </menu_item_call>
- <menu_item_call
- label="Force LLError And Crash"
- layout="topleft"
- name="Force LLError And Crash">
- <menu_item_call.on_click
- function="Advanced.ForceErrorLlerror" />
- </menu_item_call>
- <menu_item_call
- label="Force Bad Memory Access"
- layout="topleft"
- name="Force Bad Memory Access">
- <menu_item_call.on_click
- function="Advanced.ForceErrorBadMemoryAccess" />
- </menu_item_call>
- <menu_item_call
- label="Force Infinite Loop"
- layout="topleft"
- name="Force Infinite Loop">
- <menu_item_call.on_click
- function="Advanced.ForceErrorInfiniteLoop" />
- </menu_item_call>
- <menu_item_call
- label="Force Driver Crash"
- layout="topleft"
- name="Force Driver Carsh">
- <menu_item_call.on_click
- function="Advanced.ForceErrorDriverCrash" />
- </menu_item_call>
- <menu_item_call
- label="Force Software Exception"
- layout="topleft"
- name="Force Software Exception">
- <menu_item_call.on_click
- function="Advanced.ForceErrorSoftwareException" />
- </menu_item_call>
- <menu_item_call
- label="Force Disconnect Viewer"
- layout="topleft"
- name="Force Disconnect Viewer">
- <menu_item_call.on_click
- function="Advanced.ForceErrorDisconnectViewer" />
- </menu_item_call>
- <menu_item_call
- label="Simulate a Memory Leak..."
- layout="topleft"
- name="Memory Leaking Simulation">
- <menu_item_call.on_click
- function="Floater.Show"
- parameter="mem_leaking" />
- </menu_item_call>
- </menu>
- <menu
- create_jump_keys="true"
- label="Render Tests"
- layout="topleft"
- name="Render Tests"
- tear_off="true">
- <menu_item_check
- label="Camera Offset"
- layout="topleft"
- name="Camera Offset">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="CameraOffset" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="CameraOffset" />
- </menu_item_check>
- <menu_item_check
- label="Randomize Framerate"
- layout="topleft"
- name="Randomize Framerate">
- <menu_item_check.on_check
- function="Advanced.CheckRandomizeFramerate"
- parameter="Randomize Framerate" />
- <menu_item_check.on_click
- function="Advanced.ToggleRandomizeFramerate" />
- </menu_item_check>
- <menu_item_check
- label="Periodic Slow Frame"
- layout="topleft"
- name="Periodic Slow Frame">
- <menu_item_check.on_check
- function="Advanced.CheckPeriodicSlowFrame"
- parameter="points" />
- <menu_item_check.on_click
- function="Advanced.TogglePeriodicSlowFrame"
- parameter="points" />
- </menu_item_check>
- <menu_item_check
- label="Frame Test"
- layout="topleft"
- name="Frame Test">
- <menu_item_check.on_check
- function="Advanced.CheckFrameTest"
- parameter="Frame Test" />
- <menu_item_check.on_click
- function="Advanced.ToggleFrameTest" />
- </menu_item_check>
- </menu>
- <menu
- create_jump_keys="true"
- label="Render Metadata"
- layout="topleft"
- name="Render Metadata"
- tear_off="true">
- <menu_item_check
- label="Bounding Boxes"
- layout="topleft"
- name="Bounding Boxes">
- <menu_item_check.on_check
- function="Advanced.CheckInfoDisplay"
- parameter="bboxes" />
- <menu_item_check.on_click
- function="Advanced.ToggleInfoDisplay"
- parameter="bboxes" />
- </menu_item_check>
- <menu_item_check
- label="Octree"
- layout="topleft"
- name="Octree">
- <menu_item_check.on_check
- function="Advanced.CheckInfoDisplay"
- parameter="octree" />
- <menu_item_check.on_click
- function="Advanced.ToggleInfoDisplay"
- parameter="octree" />
- </menu_item_check>
- <menu_item_check
- label="Shadow Frusta"
- layout="topleft"
- name="Shadow Frusta">
- <menu_item_check.on_check
- function="Advanced.CheckInfoDisplay"
- parameter="shadow frusta" />
- <menu_item_check.on_click
- function="Advanced.ToggleInfoDisplay"
- parameter="shadow frusta" />
- </menu_item_check>
- <menu_item_check
- label="Occlusion"
- layout="topleft"
- name="Occlusion">
- <menu_item_check.on_check
- function="Advanced.CheckInfoDisplay"
- parameter="occlusion" />
- <menu_item_check.on_click
- function="Advanced.ToggleInfoDisplay"
- parameter="occlusion" />
- </menu_item_check>
- <menu_item_check
- label="Render Batches"
- layout="topleft"
- name="Render Batches">
- <menu_item_check.on_check
- function="Advanced.CheckInfoDisplay"
- parameter="render batches" />
- <menu_item_check.on_click
- function="Advanced.ToggleInfoDisplay"
- parameter="render batches" />
- </menu_item_check>
- <menu_item_check
- label="Texture Anim"
- layout="topleft"
- name="Texture Anim">
- <menu_item_check.on_check
- function="Advanced.CheckInfoDisplay"
- parameter="texture anim" />
- <menu_item_check.on_click
- function="Advanced.ToggleInfoDisplay"
- parameter="texture anim" />
- </menu_item_check>
- <menu_item_check
- label="Texture Priority"
- layout="topleft"
- name="Texture Priority">
- <menu_item_check.on_check
- function="Advanced.CheckInfoDisplay"
- parameter="texture priority" />
- <menu_item_check.on_click
- function="Advanced.ToggleInfoDisplay"
- parameter="texture priority" />
- </menu_item_check>
- <menu_item_check
- label="Texture Area"
- layout="topleft"
- name="Texture Area">
- <menu_item_check.on_check
- function="Advanced.CheckInfoDisplay"
- parameter="texture area" />
- <menu_item_check.on_click
- function="Advanced.ToggleInfoDisplay"
- parameter="texture area" />
- </menu_item_check>
- <menu_item_check
- label="Face Area"
- layout="topleft"
- name="Face Area">
- <menu_item_check.on_check
- function="Advanced.CheckInfoDisplay"
- parameter="face area" />
- <menu_item_check.on_click
- function="Advanced.ToggleInfoDisplay"
- parameter="face area" />
- </menu_item_check>
- <menu_item_check
- label="Lights"
- layout="topleft"
- name="Lights">
- <menu_item_check.on_check
- function="Advanced.CheckInfoDisplay"
- parameter="lights" />
- <menu_item_check.on_click
- function="Advanced.ToggleInfoDisplay"
- parameter="lights" />
- </menu_item_check>
- <menu_item_check
- label="Collision Skeleton"
- layout="topleft"
- name="Collision Skeleton">
- <menu_item_check.on_check
- function="Advanced.CheckInfoDisplay"
- parameter="collision skeleton" />
- <menu_item_check.on_click
- function="Advanced.ToggleInfoDisplay"
- parameter="collision skeleton" />
- </menu_item_check>
- <menu_item_check
- label="Raycast"
- layout="topleft"
- name="Raycast">
- <menu_item_check.on_check
- function="Advanced.CheckInfoDisplay"
- parameter="raycast" />
- <menu_item_check.on_click
- function="Advanced.ToggleInfoDisplay"
- parameter="raycast" />
- </menu_item_check>
- </menu>
- <menu
- create_jump_keys="true"
- label="Rendering"
- layout="topleft"
- name="Rendering"
- tear_off="true">
- <menu_item_check
- label="Axes"
- name="Axes">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="ShowAxes" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="ShowAxes" />
- </menu_item_check>
- <menu_item_check
- label="Tangent Basis"
- name="Tangent Basis">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="ShowTangentBasis" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="ShowTangentBasis" />
- </menu_item_check>
- <menu_item_call
- label="Selected Texture Info Basis"
- name="Selected Texture Info Basis"
- shortcut="control|alt|shift|T">
- <menu_item_call.on_click
- function="Advanced.SelectedTextureInfo" />
- </menu_item_call>
- <menu_item_check
- label="Wireframe"
- name="Wireframe"
- shortcut="control|shift|R">
- <menu_item_check.on_check
- function="Advanced.CheckWireframe"
- parameter="Wireframe" />
- <menu_item_check.on_click
- function="Advanced.ToggleWireframe" />
- </menu_item_check>
- <menu_item_check
- label="Object-Object Occlusion"
- name="Object-Object Occlusion"
- shortcut="control|shift|O">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="UseOcclusion" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="UseOcclusion" />
- <menu_item_check.on_enable
- function="Advanced.EnableObjectObjectOcclusion" />
- </menu_item_check>
- <menu_item_check
- label="Framebuffer Objects"
- name="Framebuffer Objects">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="RenderUseFBO" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="RenderUseFBO" />
- <menu_item_check.on_enable
- function="Advanced.EnableRenderFBO" />
- </menu_item_check>
- <menu_item_check
- label="Deferred Rendering"
- name="Deferred Rendering">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="RenderDeferred" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="RenderDeferred" />
- <menu_item_check.on_enable
- function="Advanced.EnableRenderDeferred" />
- </menu_item_check>
- <menu_item_check
- label="Global Illumintation"
- 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.EnableRenderDeferredGI" />
- </menu_item_check>
- <menu_item_separator />
- <menu_item_check
- label="Debug GL"
- name="Debug GL">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="RenderDebugGL" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="RenderDebugGL" />
- </menu_item_check>
- <menu_item_check
- label="Debug Pipeline"
- name="Debug Pipeline">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="RenderDebugGL" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="RenderDebugGL" />
- </menu_item_check>
- <menu_item_check
- label="Fast Alpha"
- name="Fast Alpha">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="RenderDebugGL" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="RenderDebugGL" />
- </menu_item_check>
- <menu_item_check
- label="Animation Textures"
- name="Animation Textures">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="RenderDebugGL" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="RenderDebugGL" />
- </menu_item_check>
- <menu_item_check
- label="Disable Textures"
- name="Disable Textures">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="TextureDisable" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="TextureDisable" />
- </menu_item_check>
- <menu_item_check
- label="Full Res Textures"
- layout="topleft"
- name="Rull Res Textures">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="TextureLoadFullRes" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="TextureLoadFullRes" />
- </menu_item_check>
- <menu_item_check
- label="Audit Textures"
- layout="topleft"
- name="Audit Textures">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="AuditTexture" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="AuditTexture" />
- </menu_item_check>
- <menu_item_check
- label="Texture Atlas"
- name="Texture Atlas">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="EnableTextureAtlas" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="EnableTextureAtlas" />
- </menu_item_check>
- <menu_item_check
- label="Render Attached Lights"
- name="Render Attached Lights">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="RenderAttachedLights" />
- <menu_item_check.on_click
- function="Advanced.HandleAttchedLightParticles"
- parameter="RenderAttachedLights" />
- </menu_item_check>
- <menu_item_check
- label="Render Attached Particles"
- name="Render Attached Particles">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="RenderAttachedParticles" />
- <menu_item_check.on_click
- function="Advanced.HandleAttchedLightParticles"
- parameter="RenderAttachedParticles" />
- </menu_item_check>
- <menu_item_check
- label="Hover Glow Objects"
- name="Hover Glow Objects">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="RenderHighlightEnable" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="RenderHighlightEnable" />
- </menu_item_check>
- </menu>
-
- <menu
- create_jump_keys="true"
- label="Network"
- layout="topleft"
- name="Network"
- tear_off="true">
- <menu_item_check
- label="Pause Agent"
- layout="topleft"
- name="AgentPause">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="AgentPause" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="AgentPause" />
- </menu_item_check>
- <menu_item_separator
- layout="topleft" />
- <menu_item_call
- label="Enable Message Log"
- layout="topleft"
- name="Enable Message Log">
- <menu_item_call.on_click
- function="Advanced.EnableMessageLog" />
- </menu_item_call>
- <menu_item_call
- label="Disable Message Log"
- layout="topleft"
- name="Disable Message Log">
- <menu_item_call.on_click
- function="Advanced.DisableMessageLog" />
- </menu_item_call>
- <menu_item_separator
- layout="topleft" />
- <menu_item_check
- label="Velocity Interpolate Objects"
- layout="topleft"
- name="Velocity Interpolate Objects">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="VelocityInterpolate" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="VelocityInterpolate" />
- </menu_item_check>
- <menu_item_check
- label="Ping Interpolate Object Positions"
- layout="topleft"
- name="Ping Interpolate Object Positions">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="PingInterpolate" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="PingInterpolate" />
- </menu_item_check>
- <menu_item_separator
- layout="topleft" />
- <menu_item_call
- label="Drop a Packet"
- layout="topleft"
- name="Drop a Packet"
- shortcut="control|alt|L">
- <menu_item_call.on_click
- function="Advanced.DropPacket" />
- </menu_item_call>
- </menu>
- <menu_item_call
- label="Dump Scripted Camera"
- layout="topleft"
- name="Dump Scripted Camera">
- <menu_item_call.on_click
- function="Advanced.DumpScriptedCamera" />
- </menu_item_call>
- <menu_item_call
- label="Bumps, Pushes & Hits"
- layout="topleft"
- name="Bumps, Pushes &amp; Hits">
- <menu_item_call.on_click
- function="Floater.Show"
- parameter="bumps" />
- </menu_item_call>
-
- <menu
- create_jump_keys="true"
- label="Recorder"
- layout="topleft"
- name="Recorder"
- tear_off="true">
- <menu_item_call
- label="Start Playback"
- layout="topleft"
- name="Start Playback">
- <menu_item_call.on_click
- function="Advanced.AgentPilot"
- parameter="start playback" />
- </menu_item_call>
- <menu_item_call
- label="Stop Playback"
- layout="topleft"
- name="Stop Playback">
- <menu_item_call.on_click
- function="Advanced.AgentPilot"
- parameter="stop playback" />
- </menu_item_call>
- <menu_item_check
- label="Loop Playback"
- layout="topleft"
- name="Loop Playback">
- <menu_item_check.on_check
- function="Advanced.CheckAgentPilotLoop"
- parameter="loopPlayback" />
- <menu_item_check.on_click
- function="Advanced.ToggleAgentPilotLoop" />
- </menu_item_check>
- <menu_item_call
- label="Start Record"
- layout="topleft"
- name="Start Record">
- <menu_item_call.on_click
- function="Advanced.AgentPilot"
- parameter="start record" />
- </menu_item_call>
- <menu_item_call
- label="Stop Record"
- layout="topleft"
- name="Stop Record">
- <menu_item_call.on_click
- function="Advanced.AgentPilot"
- parameter="stop record" />
- </menu_item_call>
- </menu>
-
- <menu
- create_jump_keys="true"
- label="World"
- layout="topleft"
- name="World"
- tear_off="true">
- <menu_item_check
- label="Sim Sun Override"
- layout="topleft"
- name="Sim Sun Override">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="SkyOverrideSimSunPosition" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="SkyOverrideSimSunPosition" />
- </menu_item_check>
- <menu_item_check
- label="Cheesy Beacon"
- layout="topleft"
- name="Cheesy Beacon">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="CheesyBeacon" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="CheesyBeacon" />
- </menu_item_check>
- <menu_item_check
- label="Fixed Weather"
- layout="topleft"
- name="Fixed Weather">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="FixedWeather" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="FixedWeather" />
- </menu_item_check>
- <menu_item_call
- label="Dump Region Object Cache"
- layout="topleft"
- name="Dump Region Object Cache">
- <menu_item_call.on_click
- function="Advanced.DumpRegionObjectCache" />
- </menu_item_call>
- </menu>
- <menu
- create_jump_keys="true"
- label="UI"
- layout="topleft"
- name="UI"
- tear_off="true">
- <!-- <menu_item_check
- label="New Bottom Bar"
- layout="topleft"
- name="New Bottom Bar">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="BottomPanelNew" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="BottomPanelNew" />
- </menu_item_check>-->
- <menu_item_call
- label="Web Browser Test"
- layout="topleft"
- name="Web Browser Test">
- <menu_item_call.on_click
- function="Advanced.WebBrowserTest"
- parameter="http://secondlife.com/app/search/slurls.html"/>
- </menu_item_call>
- <menu_item_call
- label="Dump SelectMgr"
- layout="topleft"
- name="Dump SelectMgr">
- <menu_item_call.on_click
- function="Advanced.DumpSelectMgr" />
- </menu_item_call>
- <menu_item_call
- label="Dump Inventory"
- layout="topleft"
- name="Dump Inventory">
- <menu_item_call.on_click
- function="Advanced.DumpInventory" />
- </menu_item_call>
- <menu_item_call
- label="Dump Timers"
- name="Dump Timers">
- <menu_item_call.on_click
- function="Advanced.DumpTimers" />
- </menu_item_call>
- <menu_item_call
- label="Dump Focus Holder"
- layout="topleft"
- name="Dump Focus Holder"
- shortcut="control|alt|F">
- <menu_item_call.on_click
- function="Advanced.DumpFocusHolder" />
- </menu_item_call>
- <menu_item_call
- label="Print Selected Object Info"
- layout="topleft"
- name="Print Selected Object Info"
- shortcut="control|shift|P">
- <menu_item_call.on_click
- function="Advanced.PrintSelectedObjectInfo" />
- </menu_item_call>
- <menu_item_call
- label="Print Agent Info"
- layout="topleft"
- name="Print Agent Info"
- shortcut="shift|P">
- <menu_item_call.on_click
- function="Advanced.PrintAgentInfo" />
- </menu_item_call>
- <menu_item_call
- label="Memory Stats"
- layout="topleft"
- name="Memory Stats"
- shortcut="control|alt|shift|M">
- <menu_item_call.on_click
- function="Advanced.PrintTextureMemoryStats" />
- </menu_item_call>
- <menu_item_check
- label="Double-ClickAuto-Pilot"
- layout="topleft"
- name="Double-ClickAuto-Pilot">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="DoubleClickAutoPilot" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="DoubleClickAutoPilot" />
- </menu_item_check>
-
- <menu_item_separator />
- <menu_item_check
- label="Debug SelectMgr"
- layout="topleft"
- name="Debug SelectMgr">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="DebugSelectMgr" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="DebugSelectMgr" />
- </menu_item_check>
- <menu_item_check
- label="Debug Clicks"
- layout="topleft"
- name="Debug Clicks">
- <menu_item_check.on_check
- function="Advanced.CheckDebugClicks"
- parameter="DebugClicks" />
- <menu_item_check.on_click
- function="Advanced.ToggleDebugClicks"
- parameter="DebugClicks" />
- </menu_item_check>
- <menu_item_check
- label="Debug Views"
- layout="topleft"
- name="Debug Views">
- <menu_item_check.on_check
- function="Advanced.CheckDebugViews" />
- <menu_item_check.on_click
- function="Advanced.ToggleDebugViews" />
- </menu_item_check>
- <menu_item_check
- label="Debug Name Tooltips"
- layout="topleft"
- name="Debug Name Tooltips">
- <menu_item_check.on_check
- function="Advanced.CheckXUINameTooltips"
- parameter="XUINameTooltips" />
- <menu_item_check.on_click
- function="Advanced.ToggleXUINameTooltips" />
- </menu_item_check>
- <menu_item_check
- label="Debug Mouse Events"
- layout="topleft"
- name="Debug Mouse Events">
- <menu_item_check.on_check
- function="Advanced.CheckDebugMouseEvents"
- parameter="MouseEvents" />
- <menu_item_check.on_click
- function="Advanced.ToggleDebugMouseEvents" />
- </menu_item_check>
- <menu_item_check
- label="Debug Keys"
- layout="topleft"
- name="Debug Keys">
- <menu_item_check.on_check
- function="Advanced.CheckDebugKeys"
- parameter="DebugKeys" />
- <menu_item_check.on_click
- function="Advanced.ToggleDebugKeys" />
- </menu_item_check>
- <menu_item_check
- label="Debug WindowProc"
- layout="topleft"
- name="Debug WindowProc">
- <menu_item_check.on_check
- function="Advanced.CheckDebugWindowProc"
- parameter="DebugWindowProc" />
- <menu_item_check.on_click
- function="Advanced.ToggleDebugWindowProc"
- parameter="DebugWindowProc" />
- </menu_item_check>
- </menu>
- <menu
- create_jump_keys="true"
- label="XUI"
- name="XUI"
- tear_off="true">
- <menu_item_call
- label="Reload Color Settings"
- layout="topleft"
- name="Reload Color Settings">
- <menu_item_call.on_click
- function="Advanced.ReloadColorSettings" />
- </menu_item_call>
- <menu_item_call
- label="Show Font Test"
- layout="topleft"
- name="Show Font Test">
- <menu_item_call.on_click
- function="Floater.Show"
- parameter="font_test" />
- </menu_item_call>
- <menu_item_call
- label="Load from XML..."
- layout="topleft"
- name="Load from XML">
- <menu_item_call.on_click
- function="Advanced.LoadUIFromXML" />
- </menu_item_call>
- <menu_item_call
- label="Save to XML..."
- layout="topleft"
- name="Save to XML">
- <menu_item_call.on_click
- function="Advanced.SaveUIToXML" />
- </menu_item_call>
- <menu_item_check
- label="Show XUI Names"
- layout="topleft"
- name="Show XUI Names">
- <menu_item_check.on_check
- function="Advanced.CheckXUINames"
- parameter="showUIname" />
- <menu_item_check.on_click
- function="Advanced.ToggleXUINames" />
- </menu_item_check>
- <menu_item_call
- label="Send Test IMs"
- layout="topleft"
- name="Send Test IMs">
- <menu_item_call.on_click
- function="Advanced.SendTestIMs" />
- </menu_item_call>
- <menu_item_call
- label="Test Inspectors"
- name="Test Inspectors"
- shortcut="control|shift|I">
- <menu_item_call.on_click
- function="Floater.Show"
- parameter="test_inspectors" />
- </menu_item_call>
- </menu>
- <menu
- create_jump_keys="true"
- label="Avatar"
- layout="topleft"
- name="Character"
- tear_off="true">
- <menu
- create_jump_keys="true"
- label="Grab Baked Texture"
- layout="topleft"
- name="Grab Baked Texture"
- tear_off="true">
- <menu_item_call
- label="Iris"
- layout="topleft"
- name="Iris">
- <menu_item_call.on_click
- function="Advanced.GrabBakedTexture"
- parameter="iris" />
- <menu_item_call.on_enable
- function="Advanced.EnableGrabBakedTexture"
- parameter="iris" />
- </menu_item_call>
- <menu_item_call
- label="Head"
- layout="topleft"
- name="Head">
- <menu_item_call.on_click
- function="Advanced.GrabBakedTexture"
- parameter="head" />
- <menu_item_call.on_enable
- function="Advanced.EnableGrabBakedTexture"
- parameter="head" />
- </menu_item_call>
- <menu_item_call
- label="Upper Body"
- layout="topleft"
- name="Upper Body">
- <menu_item_call.on_click
- function="Advanced.GrabBakedTexture"
- parameter="upper" />
- <menu_item_call.on_enable
- function="Advanced.EnableGrabBakedTexture"
- parameter="upper" />
- </menu_item_call>
- <menu_item_call
- label="Lower Body"
- layout="topleft"
- name="Lower Body">
- <menu_item_call.on_click
- function="Advanced.GrabBakedTexture"
- parameter="lower" />
- <menu_item_call.on_enable
- function="Advanced.EnableGrabBakedTexture"
- parameter="lower" />
- </menu_item_call>
- <menu_item_call
- label="Skirt"
- layout="topleft"
- name="Skirt">
- <menu_item_call.on_click
- function="Advanced.GrabBakedTexture"
- parameter="skirt" />
- <menu_item_call.on_enable
- function="Advanced.EnableGrabBakedTexture"
- parameter="skirt" />
- </menu_item_call>
- </menu>
- <menu
- create_jump_keys="true"
- label="Character Tests"
- layout="topleft"
- name="Character Tests"
- tear_off="true">
- <menu_item_call
- label="Appearance To XML"
- layout="topleft"
- name="Appearance To XML">
- <menu_item_call.on_click
- function="Advanced.AppearanceToXML" />
- </menu_item_call>
- <menu_item_call
- label="Toggle Character Geometry"
- layout="topleft"
- name="Toggle Character Geometry">
- <menu_item_call.on_click
- function="Advanced.ToggleCharacterGeometry" />
- <menu_item_call.on_enable
- function="IsGodCustomerService" />
- </menu_item_call>
- <menu_item_call
- label="Test Male"
- layout="topleft"
- name="Test Male">
- <menu_item_call.on_click
- function="Advanced.TestMale" />
- </menu_item_call>
- <menu_item_call
- label="Test Female"
- layout="topleft"
- name="Test Female">
- <menu_item_call.on_click
- function="Advanced.TestFemale" />
- </menu_item_call>
- <menu_item_call
- label="Toggle PG"
- layout="topleft"
- name="Toggle PG">
- <menu_item_call.on_click
- function="Advanced.TogglePG" />
- </menu_item_call>
- <menu_item_check
- label="Allow Select Avatar"
- layout="topleft"
- name="Allow Select Avatar">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="AllowSelectAvatar" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="AllowSelectAvatar" />
- </menu_item_check>
- </menu>
- <menu_item_call
- label="Force Params to Default"
- layout="topleft"
- name="Force Params to Default">
- <menu_item_call.on_click
- function="Advanced.ForceParamsToDefault" />
- </menu_item_call>
- <menu_item_check
- label="Animation Info"
- layout="topleft"
- name="Animation Info">
- <menu_item_check.on_check
- function="Advanced.CheckAnimationInfo"
- parameter="AnimationInfo" />
- <menu_item_check.on_click
- function="Advanced.ToggleAnimationInfo"
- parameter="" />
- </menu_item_check>
- <menu_item_check
- label="Slow Motion Animations"
- layout="topleft"
- name="Slow Motion Animations">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="SlowMotionAnimation" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="SlowMotionAnimation" />
- </menu_item_check>
- <menu_item_check
- label="Show Look At"
- layout="topleft"
- name="Show Look At">
- <menu_item_check.on_check
- function="Advanced.CheckShowLookAt"
- parameter="ShowLookAt" />
- <menu_item_check.on_click
- function="Advanced.ToggleShowLookAt" />
- </menu_item_check>
- <menu_item_check
- label="Show Point At"
- layout="topleft"
- name="Show Point At">
- <menu_item_check.on_check
- function="Advanced.CheckShowPointAt"
- parameter="ShowPointAt" />
- <menu_item_check.on_click
- function="Advanced.ToggleShowPointAt" />
- </menu_item_check>
- <menu_item_check
- label="Debug Joint Updates"
- layout="topleft"
- name="Debug Joint Updates">
- <menu_item_check.on_check
- function="Advanced.CheckDebugJointUpdates"
- parameter="DebugJointUpdates" />
- <menu_item_check.on_click
- function="Advanced.ToggleDebugJointUpdates" />
- </menu_item_check>
- <menu_item_check
- label="Disable LOD"
- layout="topleft"
- name="Disable LOD">
- <menu_item_check.on_check
- function="Advanced.CheckDisableLOD"
- parameter="DisableLOD" />
- <menu_item_check.on_click
- function="Advanced.ToggleDisableLOD" />
- </menu_item_check>
- <menu_item_check
- label="Debug Character Vis"
- layout="topleft"
- name="Debug Character Vis">
- <menu_item_check.on_check
- function="Advanced.CheckDebugCharacterVis"
- parameter="DebugCharacterVis" />
- <menu_item_check.on_click
- function="Advanced.ToggleDebugCharacterVis" />
- </menu_item_check>
- <menu_item_check
- label="Show Collision Skeleton"
- layout="topleft"
- name="Show Collision Skeleton">
- <menu_item_check.on_check
- function="Advanced.CheckInfoDisplay"
- parameter="collision skeleton" />
- <menu_item_check.on_click
- function="Advanced.ToggleInfoDisplay"
- parameter="collision skeleton" />
- </menu_item_check>
- <menu_item_check
- label="Display Agent Target"
- layout="topleft"
- name="Display Agent Target">
- <menu_item_check.on_check
- function="Advanced.CheckInfoDisplay"
- parameter="agent target" />
- <menu_item_check.on_click
- function="Advanced.ToggleInfoDisplay"
- parameter="agent target" />
- </menu_item_check>
-<!-- Appears not to exist anymore
- <menu_item_check
- label="Debug Rotation"
- layout="topleft"
- name="Debug Rotation">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="DebugAvatarRotation" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="DebugAvatarRotation" />
- </menu_item_check> -->
--->
- <menu_item_call
- label="Dump Attachments"
- layout="topleft"
- name="Dump Attachments">
- <menu_item_call.on_click
- function="Advanced.DumpAttachments" />
- </menu_item_call>
- <menu_item_call
- label="Debug Avatar Textures"
- layout="topleft"
- name="Debug Avatar Textures"
- shortcut="control|alt|shift|A">
- <menu_item_call.on_click
- function="Advanced.DebugAvatarTextures" />
- </menu_item_call>
- <menu_item_call
- label="Dump Local Textures"
- layout="topleft"
- name="Dump Local Textures"
- shortcut="alt|shift|M">
- <menu_item_call.on_click
- function="Advanced.DumpAvatarLocalTextures" />
- </menu_item_call>
- </menu>
- <menu_item_separator
- layout="topleft" />
- <menu_item_call
- label="Compress Images"
- layout="topleft"
- name="Compress Images">
- <menu_item_call.on_click
- function="Advanced.CompressImage" />
- </menu_item_call>
- <menu_item_check
- label="Output Debug Minidump"
- layout="topleft"
- name="Output Debug Minidump">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="SaveMinidump" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="SaveMinidump" />
- </menu_item_check>
- <menu_item_check
- label="Console Window on next Run"
- layout="topleft"
- name="Console Window">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="ShowConsoleWindow" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="ShowConsoleWindow" />
- </menu_item_check>
- <menu_item_separator
- layout="topleft" />
- <menu_item_check
- label="Show Admin Menu"
- layout="topleft"
- name="View Admin Options">
- <menu_item_check.on_check
- function="Advanced.CheckViewAdminOptions"
- parameter="ViewAdminOptions" />
- <menu_item_check.on_click
- function="Advanced.ToggleViewAdminOptions" />
- </menu_item_check>
- <menu_item_call
- label="Request Admin Status"
- layout="topleft"
- name="Request Admin Options"
- shortcut="control|alt|G">
- <menu_item_call.on_click
- function="Advanced.RequestAdminStatus" />
- </menu_item_call>
- <menu_item_call
- label="Leave Admin Status"
- layout="topleft"
- name="Leave Admin Options"
- shortcut="control|alt|shift|G">
- <menu_item_call.on_click
- function="Advanced.LeaveAdminStatus" />
- </menu_item_call>
- </menu>
- <menu
- create_jump_keys="true"
- label="Admin"
- layout="topleft"
- name="Admin"
- tear_off="true"
- visible="false">
- <menu
- create_jump_keys="true"
- label="Object"
- layout="topleft"
- tear_off="true">
- <menu_item_call
- label="Take Copy"
- layout="topleft"
- name="Take Copy"
- shortcut="control|alt|shift|O">
- <menu_item_call.on_click
- function="Admin.ForceTakeCopy" />
- <menu_item_call.on_enable
- function="IsGodCustomerService" />
- </menu_item_call>
- <menu_item_call
- label="Force Owner To Me"
- layout="topleft"
- name="Force Owner To Me">
- <menu_item_call.on_click
- function="Admin.HandleObjectOwnerSelf" />
- <menu_item_call.on_enable
- function="IsGodCustomerService" />
- </menu_item_call>
- <menu_item_call
- label="Force Owner Permissive"
- layout="topleft"
- name="Force Owner Permissive">
- <menu_item_call.on_click
- function="Admin.HandleObjectOwnerPermissive" />
- <menu_item_call.on_enable
- function="IsGodCustomerService" />
- </menu_item_call>
- <menu_item_call
- label="Delete"
- layout="topleft"
- name="Delete"
- shortcut="control|alt|shift|Del">
- <menu_item_call.on_click
- function="Admin.HandleForceDelete" />
- <menu_item_call.on_enable
- function="IsGodCustomerService" />
- </menu_item_call>
- <menu_item_call
- label="Lock"
- layout="topleft"
- name="Lock"
- shortcut="control|alt|shift|L">
- <menu_item_call.on_click
- function="Admin.HandleObjectLock" />
- <menu_item_call.on_enable
- function="IsGodCustomerService" />
- </menu_item_call>
- <menu_item_call
- label="Get Assets IDs"
- layout="topleft"
- name="Get Assets IDs"
- shortcut="control|alt|shift|I">
- <menu_item_call.on_click
- function="Admin.HandleObjectAssetIDs" />
- <menu_item_call.on_enable
- function="IsGodCustomerService" />
- </menu_item_call>
- </menu>
- <menu
- create_jump_keys="true"
- label="Parcel"
- layout="topleft"
- name="Parcel"
- tear_off="true">
- <menu_item_call
- label="Owner To Me"
- layout="topleft"
- name="Owner To Me">
- <menu_item_call.on_click
- function="Admin.HandleForceParcelOwnerToMe" />
- <menu_item_call.on_enable
- function="IsGodCustomerService" />
- </menu_item_call>
- <menu_item_call
- label="Set to Linden Content"
- layout="topleft"
- name="Set to Linden Content"
- shortcut="control|alt|shift|C">
- <menu_item_call.on_click
- function="Admin.HandleForceParcelToContent" />
- <menu_item_call.on_enable
- function="IsGodCustomerService" />
- </menu_item_call>
- <menu_item_call
- label="Claim Public Land"
- layout="topleft"
- name="Claim Public Land">
- <menu_item_call.on_click
- function="Admin.HandleClaimPublicLand" />
- <menu_item_call.on_enable
- function="IsGodCustomerService" />
- </menu_item_call>
- </menu>
- <menu
- create_jump_keys="true"
- label="Region"
- layout="topleft"
- name="Region"
- tear_off="true">
- <menu_item_call
- label="Dump Temp Asset Data"
- layout="topleft"
- name="Dump Temp Asset Data">
- <menu_item_call.on_click
- function="Admin.HandleRegionDumpTempAssetData" />
- <menu_item_call.on_enable
- function="IsGodCustomerService" />
- </menu_item_call>
- <menu_item_call
- label="Save Region State"
- layout="topleft"
- name="Save Region State">
- <menu_item_call.on_click
- function="Admin.OnSaveState" />
- <menu_item_call.on_enable
- function="IsGodCustomerService" />
- </menu_item_call>
- </menu>
- <menu_item_call
- label="God Tools"
- layout="topleft"
- name="God Tools">
- <menu_item_call.on_click
- function="Floater.Show"
- parameter="god_tools" />
- <menu_item_call.on_enable
- function="IsGodCustomerService" />
- </menu_item_call>
- </menu>
- <menu
- create_jump_keys="true"
- label="Admin"
- layout="topleft"
- name="Deprecated"
- tear_off="true"
- visible="false">
- <menu
- create_jump_keys="true"
- label="Attach Object"
- layout="topleft"
- mouse_opaque="false"
- name="Attach Object"
- tear_off="true" />
- <menu
- create_jump_keys="true"
- label="Detach Object"
- layout="topleft"
- mouse_opaque="false"
- name="Detach Object"
- tear_off="true" />
- <menu
- create_jump_keys="true"
- label="Take Off Clothing"
- layout="topleft"
- mouse_opaque="false"
- name="Take Off Clothing"
- tear_off="true">
- <menu_item_call
- label="Shirt"
- layout="topleft"
- name="Shirt">
- <menu_item_call.on_click
- function="Edit.TakeOff"
- parameter="shirt" />
- <menu_item_call.on_enable
- function="Edit.EnableTakeOff"
- parameter="shirt" />
- </menu_item_call>
- <menu_item_call
- label="Pants"
- layout="topleft"
- name="Pants">
- <menu_item_call.on_click
- function="Edit.TakeOff"
- parameter="pants" />
- <menu_item_call.on_enable
- function="Edit.EnableTakeOff"
- parameter="pants" />
- </menu_item_call>
- <menu_item_call
- label="Shoes"
- layout="topleft"
- name="Shoes">
- <menu_item_call.on_click
- function="Edit.TakeOff"
- parameter="shoes" />
- <menu_item_call.on_enable
- function="Edit.EnableTakeOff"
- parameter="shoes" />
- </menu_item_call>
- <menu_item_call
- label="Socks"
- layout="topleft"
- name="Socks">
- <menu_item_call.on_click
- function="Edit.TakeOff"
- parameter="socks" />
- <menu_item_call.on_enable
- function="Edit.EnableTakeOff"
- parameter="socks" />
- </menu_item_call>
- <menu_item_call
- label="Jacket"
- layout="topleft"
- name="Jacket">
- <menu_item_call.on_click
- function="Edit.TakeOff"
- parameter="jacket" />
- <menu_item_call.on_enable
- function="Edit.EnableTakeOff"
- parameter="jacket" />
- </menu_item_call>
- <menu_item_call
- label="Gloves"
- layout="topleft"
- name="Gloves">
- <menu_item_call.on_click
- function="Edit.TakeOff"
- parameter="gloves" />
- <menu_item_call.on_enable
- function="Edit.EnableTakeOff"
- parameter="gloves" />
- </menu_item_call>
- <menu_item_call
- label="Undershirt"
- layout="topleft"
- name="Menu Undershirt">
- <menu_item_call.on_click
- function="Edit.TakeOff"
- parameter="undershirt" />
- <menu_item_call.on_enable
- function="Edit.EnableTakeOff"
- parameter="undershirt" />
- </menu_item_call>
- <menu_item_call
- label="Underpants"
- layout="topleft"
- name="Menu Underpants">
- <menu_item_call.on_click
- function="Edit.TakeOff"
- parameter="underpants" />
- <menu_item_call.on_enable
- function="Edit.EnableTakeOff"
- parameter="underpants" />
- </menu_item_call>
- <menu_item_call
- label="Skirt"
- layout="topleft"
- name="Skirt">
- <menu_item_call.on_click
- function="Edit.TakeOff"
- parameter="skirt" />
- <menu_item_call.on_enable
- function="Edit.EnableTakeOff"
- parameter="skirt" />
- </menu_item_call>
- <menu_item_call
- label="Alpha"
- layout="topleft"
- name="Alpha">
- <menu_item_call.on_click
- function="Edit.TakeOff"
- parameter="alpha" />
- <menu_item_call.on_enable
- function="Edit.EnableTakeOff"
- parameter="alpha" />
- </menu_item_call>
- <menu_item_call
- label="Tattoo"
- layout="topleft"
- name="Tattoo">
- <menu_item_call.on_click
- function="Edit.TakeOff"
- parameter="tattoo" />
- <menu_item_call.on_enable
- function="Edit.EnableTakeOff"
- parameter="tattoo" />
- </menu_item_call>
- <menu_item_call
- label="All Clothes"
- layout="topleft"
- name="All Clothes">
- <menu_item_call.on_click
- function="Edit.TakeOff"
- parameter="all" />
- </menu_item_call>
- </menu>
- <menu_item_check
- label="Show Toolbar"
- layout="topleft"
- name="Show Toolbar">
- <menu_item_check.on_check
- function="FloaterVisible"
- parameter="toolbar" />
- <menu_item_check.on_click
- function="ShowFloater"
- parameter="toolbar" />
- </menu_item_check>
- <menu
- create_jump_keys="true"
- label="Help"
- layout="topleft"
- name="Help"
- tear_off="true">
- <menu_item_call
- label="Official Linden Blog"
- layout="topleft"
- name="Official Linden Blog">
- <menu_item_call.on_click
- function="PromptShowURL"
- name="OfficialLindenBlog_url"
- parameter="WebLaunchSupportWiki,http://blog.secondlife.com/" />
- </menu_item_call>
- <menu_item_call
- label="Scripting Portal"
- layout="topleft"
- name="Scripting Portal">
- <menu_item_call.on_click
- function="PromptShowURL"
- name="ScriptingPortal_url"
- parameter="WebLaunchLSLWiki,http://wiki.secondlife.com/wiki/LSL_Portal" />
- </menu_item_call>
- <menu
- create_jump_keys="true"
- label="Bug Reporting"
- layout="topleft"
- name="Bug Reporting"
- tear_off="true">
- <menu_item_call
- label="Public Issue Tracker"
- layout="topleft"
- name="Public Issue Tracker">
- <menu_item_call.on_click
- function="PromptShowURL"
- name="PublicIssueTracker_url"
- parameter="WebLaunchPublicIssue,http://jira.secondlife.com" />
- </menu_item_call>
- <menu_item_call
- label="Public Issue Tracker Help"
- layout="topleft"
- name="Publc Issue Tracker Help">
- <menu_item_call.on_click
- function="PromptShowURL"
- name="PublicIssueTrackerHelp_url"
- parameter="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker" />
- </menu_item_call>
- <menu_item_separator
- layout="topleft" />
- <menu_item_call
- label="Bug Reporting 101"
- layout="topleft"
- name="Bug Reporing 101">
- <menu_item_call.on_click
- function="PromptShowURL"
- name="BugReporting101_url"
- parameter="WebLaunchBugReport101,http://wiki.secondlife.com/wiki/Bug_Reporting_101" />
- </menu_item_call>
- <menu_item_call
- label="Security Issues"
- layout="topleft"
- name="Security Issues">
- <menu_item_call.on_click
- function="PromptShowURL"
- name="SecurityIssues_url"
- parameter="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues" />
- </menu_item_call>
- <menu_item_call
- label="QA Wiki"
- layout="topleft"
- name="QA Wiki">
- <menu_item_call.on_click
- function="PromptShowURL"
- name="QAWiki_url"
- parameter="WebLaunchQAWiki,http://wiki.secondlife.com/wiki/QA_Portal" />
- </menu_item_call>
- </menu>
- </menu>
- </menu>
-</menu_bar>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu_bar + bg_visible="false" + follows="left|top|right" + layout="topleft" + name="Main Menu"> + <menu + label="Me" + layout="topleft" + name="Me" + tear_off="true"> + <menu_item_call + label="Preferences" + layout="topleft" + name="Preferences" + shortcut="control|P"> + <menu_item_call.on_click + function="Floater.Show" + parameter="preferences" /> + </menu_item_call> + <menu_item_call + label="My Dashboard" + layout="topleft" + 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$" + layout="topleft" + name="Buy and Sell L$"> + <menu_item_call.on_click + function="ShowFloater" + parameter="buy currency" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="My Profile" + layout="topleft" + name="Profile"> + <menu_item_call.on_click + function="ShowAgentProfile" + parameter="agent" /> + </menu_item_call> + <menu_item_call + label="My Appearance" + layout="topleft" + name="Appearance"> + <menu_item_call.on_click + function="ShowFloater" + parameter="appearance" /> + <menu_item_call.on_enable + function="Edit.EnableCustomizeAvatar" /> + </menu_item_call> + <menu_item_check + label="My Inventory" + layout="topleft" + name="Inventory" + shortcut="control|shift|I"> + <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="Show Sidetray Inventory" + name="ShowSidetrayInventory" + shortcut="control|I" + visible="false"> + <menu_item_call.on_click + function="ShowSidetrayPanel" + parameter="sidepanel_inventory" /> + </menu_item_call> + <menu_item_call + label="My Gestures" + layout="topleft" + name="Gestures" + shortcut="control|G"> + <menu_item_call.on_click + function="ShowFloater" + parameter="gestures" /> + </menu_item_call> + <menu + label="My Status" + layout="topleft" + name="Status" + tear_off="true"> + <menu_item_call + label="Away" + layout="topleft" + name="Set Away"> + <menu_item_call.on_click + function="World.SetAway" /> + </menu_item_call> + <menu_item_separator + layout="topleft"/> + <menu_item_call + label="Busy" + layout="topleft" + name="Set Busy"> + <menu_item_call.on_click + function="World.SetBusy"/> + </menu_item_call> + </menu> + <menu_item_call + label="Request Admin Status" + layout="topleft" + 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" + layout="topleft" + 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 + layout="topleft" /> + <menu_item_call + label="Quit [APP_NAME]" + layout="topleft" + name="Quit" + shortcut="control|Q"> + <menu_item_call.on_click + function="File.Quit" /> + </menu_item_call> + </menu> + <menu + label="Communicate" + layout="topleft" + name="Communicate" + tear_off="true"> + <menu_item_call + label="My Friends" + layout="topleft" + name="My Friends" + shortcut="control|shift|F"> + <menu_item_call.on_click + function="SideTray.PanelPeopleTab" + parameter="friends_panel" /> + </menu_item_call> + <menu_item_call + label="My Groups" + layout="topleft" + name="My Groups"> + <menu_item_call.on_click + function="SideTray.PanelPeopleTab" + parameter="groups_panel" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <!--menu_item_call + label="Chat" + layout="topleft" + name="Chat"> + <menu_item_call.on_click + function="World.Chat" /> + </menu_item_call--> + <menu_item_check + label="Nearby Chat" + layout="topleft" + name="Nearby Chat" + shortcut="control|H"> + <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" + layout="topleft" + 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 Media" + layout="topleft" + name="Nearby Media" + shortcut="control|alt|N"> + <menu_item_check.on_check + function="Floater.Visible" + parameter="nearby_media" /> + <menu_item_check.on_click + function="Floater.Toggle" + parameter="nearby_media" /> + </menu_item_check> + <!--menu_item_check + label="Block List" + layout="topleft" + name="Mute List"> + <menu_item_check.on_check + function="Floater.Visible" + parameter="mute" /> + <menu_item_check.on_click + function="Floater.Toggle" + parameter="mute" /> + </menu_item_check--> + <menu_item_separator + layout="topleft" /> + <menu_item_check + label="(Legacy) Communicate" + layout="topleft" + name="Instant Message" + shortcut="control|T"> + <menu_item_check.on_check + function="Floater.Visible" + parameter="communicate" /> + <menu_item_check.on_click + function="Floater.Toggle" + parameter="communicate" /> + </menu_item_check> + <menu_item_call + label="(Temp) Media Remote Ctrl" + layout="topleft" + name="Preferences" + shortcut="control|alt|M"> + <menu_item_call.on_click + function="Floater.Toggle" + parameter="media_remote_ctrl" /> + </menu_item_call> + </menu> + <menu + label="World" + layout="topleft" + name="World" + tear_off="true"> + <menu_item_check + label="Move" + layout="topleft" + name="Movement Controls"> + <menu_item_check.on_check + function="Floater.Visible" + parameter="moveview" /> + <menu_item_check.on_click + function="Floater.Toggle" + parameter="moveview" /> + </menu_item_check> + <menu_item_check + label="View" + layout="topleft" + name="Camera Controls"> + <menu_item_check.on_check + function="Floater.Visible" + parameter="camera" /> + <menu_item_check.on_click + function="Floater.Toggle" + parameter="camera" /> + </menu_item_check> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="About Land" + layout="topleft" + name="About Land"> + <menu_item_call.on_click + function="Floater.Show" + parameter="about_land" /> + </menu_item_call> + <menu_item_call + label="Region/Estate" + layout="topleft" + name="Region/Estate"> + <menu_item_call.on_click + function="Floater.Show" + parameter="region_info" /> + </menu_item_call> + <menu_item_call + label="Buy Land" + layout="topleft" + name="Buy Land"> + <menu_item_call.on_click + function="ShowFloater" + parameter="buy land" /> + <menu_item_call.on_enable + function="World.EnableBuyLand" /> + </menu_item_call> + <menu_item_call + label="My Land" + layout="topleft" + name="My Land"> + <menu_item_call.on_click + function="ShowFloater" + parameter="land_holdings" /> + </menu_item_call> + <menu + create_jump_keys="true" + label="Show" + layout="topleft" + name="Land" + tear_off="true"> + <menu_item_check + label="Ban Lines" + layout="topleft" + name="Ban Lines"> + <menu_item_check.on_check + control="ShowBanLines" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="ShowBanLines" /> + </menu_item_check> + <menu_item_check + label="Beacons" + layout="topleft" + name="beacons" + shortcut="control|alt|shift|N"> + <menu_item_check.on_check + function="Floater.Visible" + parameter="beacons" /> + <menu_item_check.on_click + function="Floater.Toggle" + parameter="beacons" /> + </menu_item_check> + <menu_item_check + label="Property Lines" + layout="topleft" + name="Property Lines" + shortcut="control|alt|shift|P"> + <menu_item_check.on_check + control="ShowPropertyLines" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="ShowPropertyLines" /> + </menu_item_check> + <menu_item_check + label="Land Owners" + layout="topleft" + name="Land Owners"> + <menu_item_check.on_check + control="ShowParcelOwners" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="ShowParcelOwners" /> + </menu_item_check> + </menu> + <menu_item_separator + layout="topleft" /> + <menu + label="Landmarks" + layout="topleft" + name="Landmarks" + tear_off="true"> + <menu_item_call + label="Create Landmark Here" + layout="topleft" + 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="Set Home to Here" + layout="topleft" + 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> + <menu_item_call + label="Home" + layout="topleft" + 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_check + label="Mini-Map" + layout="topleft" + 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" + layout="topleft" + name="World Map" + shortcut="control|M" + use_mac_ctrl="true"> + <menu_item_check.on_check + function="Floater.Visible" + parameter="world_map" /> + <menu_item_check.on_click + function="Floater.Toggle" + parameter="world_map" /> + </menu_item_check> + <!-- <menu_item_check + label="Show Navigation Bar" + layout="topleft" + name="ShowNavbarNavigationPanel"> + <menu_item_check.on_click + function="ToggleControl" + parameter="ShowNavbarNavigationPanel" /> + <menu_item_check.on_check + function="CheckControl" + parameter="ShowNavbarNavigationPanel" /> + </menu_item_check> + <menu_item_check + label="Show Favorites Bar" + layout="topleft" + name="ShowNavbarFavoritesPanel"> + <menu_item_check.on_click + function="ToggleControl" + parameter="ShowNavbarFavoritesPanel" /> + <menu_item_check.on_check + function="CheckControl" + parameter="ShowNavbarFavoritesPanel" /> + </menu_item_check> + <menu_item_separator + layout="topleft" />--> + <menu_item_call + label="Snapshot" + layout="topleft" + name="Take Snapshot" + shortcut="control|shift|S"> + <menu_item_call.on_click + function="Floater.Show" + parameter="snapshot" /> + </menu_item_call> + <menu + create_jump_keys="true" + label="Sun" + layout="topleft" + name="Environment Settings" + tear_off="true"> + <menu_item_call + label="Sunrise" + layout="topleft" + name="Sunrise"> + <menu_item_call.on_click + function="World.EnvSettings" + parameter="sunrise" /> + </menu_item_call> + <menu_item_call + label="Midday" + layout="topleft" + name="Noon" + shortcut="control|shift|Y"> + <menu_item_call.on_click + function="World.EnvSettings" + parameter="noon" /> + </menu_item_call> + <menu_item_call + label="Sunset" + layout="topleft" + name="Sunset" + shortcut="control|shift|N"> + <menu_item_call.on_click + function="World.EnvSettings" + parameter="sunset" /> + </menu_item_call> + <menu_item_call + label="Midnight" + layout="topleft" + name="Midnight"> + <menu_item_call.on_click + function="World.EnvSettings" + parameter="midnight" /> + </menu_item_call> + <menu_item_call + label="Use the Estate Time" + layout="topleft" + name="Revert to Region Default"> + <menu_item_call.on_click + function="World.EnvSettings" + parameter="default" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Environment Editor" + layout="topleft" + name="Environment Editor"> + <menu_item_call.on_click + function="World.EnvSettings" + parameter="editor" /> + </menu_item_call> + </menu> + </menu> + <menu + create_jump_keys="true" + label="Build" + layout="topleft" + name="BuildTools" + tear_off="true" + visible="true"> + <menu_item_check + label="Build" + layout="topleft" + name="Show Build Tools" + shortcut="control|B"> + <menu_item_check.on_check + function="Build.Active" /> + <menu_item_check.on_click + function="Build.Toggle" /> + <menu_item_check.on_enable + function="Build.Enabled" /> + </menu_item_check> + <menu + create_jump_keys="true" + label="Select Build Tool" + layout="topleft" + name="Select Tool" + tear_off="true"> + <menu_item_call + label="Focus Tool" + layout="topleft" + name="Focus" + shortcut="control|1"> + <menu_item_call.on_click + function="Tools.SelectTool" + parameter="focus" /> + </menu_item_call> + <menu_item_call + label="Move Tool" + layout="topleft" + name="Move" + shortcut="control|2"> + <menu_item_call.on_click + function="Tools.SelectTool" + parameter="move" /> + </menu_item_call> + <menu_item_call + label="Edit Tool" + layout="topleft" + name="Edit" + shortcut="control|3"> + <menu_item_call.on_click + function="Tools.SelectTool" + parameter="edit" /> + </menu_item_call> + <menu_item_call + label="Create Tool" + layout="topleft" + name="Create" + shortcut="control|4"> + <menu_item_call.on_click + function="Tools.SelectTool" + parameter="create" /> + </menu_item_call> + <menu_item_call + label="Land Tool" + layout="topleft" + name="Land" + shortcut="control|5"> + <menu_item_call.on_click + function="Tools.SelectTool" + parameter="land" /> + </menu_item_call> + </menu> + <menu + create_jump_keys="true" + label="Edit" + layout="topleft" + name="Edit" + tear_off="true"> + <menu_item_call + label="Undo" + layout="topleft" + name="Undo" + shortcut="control|Z"> + <menu_item_call.on_click + function="Edit.Undo" /> + <menu_item_call.on_enable + function="Edit.EnableUndo" /> + </menu_item_call> + <menu_item_call + label="Redo" + layout="topleft" + name="Redo" + shortcut="control|Y"> + <menu_item_call.on_click + function="Edit.Redo" /> + <menu_item_call.on_enable + function="Edit.EnableRedo" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Cut" + layout="topleft" + name="Cut" + shortcut="control|X"> + <menu_item_call.on_click + function="Edit.Cut" /> + <menu_item_call.on_enable + function="Edit.EnableCut" /> + </menu_item_call> + <menu_item_call + label="Copy" + layout="topleft" + name="Copy" + shortcut="control|C"> + <menu_item_call.on_click + function="Edit.Copy" /> + <menu_item_call.on_enable + function="Edit.EnableCopy" /> + </menu_item_call> + <menu_item_call + label="Paste" + layout="topleft" + name="Paste" + shortcut="control|V"> + <menu_item_call.on_click + function="Edit.Paste" /> + <menu_item_call.on_enable + function="Edit.EnablePaste" /> + </menu_item_call> + <menu_item_call + label="Delete" + layout="topleft" + name="Delete" + shortcut="Del"> + <menu_item_call.on_click + function="Edit.Delete" /> + <menu_item_call.on_enable + function="Edit.EnableDelete" /> + </menu_item_call> + <menu_item_call + label="Duplicate" + layout="topleft" + name="Duplicate" + shortcut="control|D"> + <menu_item_call.on_click + function="Edit.Duplicate" /> + <menu_item_call.on_enable + function="Edit.EnableDuplicate" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Select All" + layout="topleft" + name="Select All" + shortcut="control|A"> + <menu_item_call.on_click + function="Edit.SelectAll" /> + <menu_item_call.on_enable + function="Edit.EnableSelectAll" /> + </menu_item_call> + <menu_item_call + label="Deselect" + layout="topleft" + name="Deselect" + shortcut="control|E"> + <menu_item_call.on_click + function="Edit.Deselect" /> + <menu_item_call.on_enable + function="Edit.EnableDeselect" /> + </menu_item_call> + </menu> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Link" + layout="topleft" + name="Link" + shortcut="control|L"> + <menu_item_call.on_click + function="Tools.Link" /> + <menu_item_call.on_enable + function="Tools.EnableLink" /> + </menu_item_call> + <menu_item_call + label="Unlink" + layout="topleft" + name="Unlink" + shortcut="control|shift|L"> + <menu_item_call.on_click + function="Tools.Unlink" /> + <menu_item_call.on_enable + function="Tools.EnableUnlink" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Focus on Selection" + layout="topleft" + name="Focus on Selection" + shortcut="H"> + <menu_item_call.on_click + function="Tools.LookAtSelection" + parameter="focus" /> + <menu_item_call.on_enable + function="Tools.SomethingSelectedNoHUD" /> + </menu_item_call> + <menu_item_call + label="Zoom to Selection" + layout="topleft" + name="Zoom to Selection" + shortcut="shift|H"> + <menu_item_call.on_click + function="Tools.LookAtSelection" + parameter="zoom" /> + <menu_item_call.on_enable + function="Tools.SomethingSelectedNoHUD" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu + create_jump_keys="true" + label="Object" + layout="topleft" + name="Object" + tear_off="true"> + <menu_item_call + label="Buy" + layout="topleft" + name="Menu Object Take" + visible="true"> + <menu_item_call.on_click + function="Tools.BuyOrTake" /> + <menu_item_call.on_enable + function="Tools.EnableBuyOrTake" + name="EnableBuyOrTake" + parameter="Buy,Take" /> + </menu_item_call> + <menu_item_call + label="Take Copy" + layout="topleft" + name="Take Copy"> + <menu_item_call.on_click + function="Tools.TakeCopy" /> + <menu_item_call.on_enable + function="Tools.EnableTakeCopy" /> + </menu_item_call> + <menu_item_call + label="Save Back to My Inventory" + layout="topleft" + name="Save Object Back to My Inventory"> + <menu_item_call.on_click + function="Tools.SaveToInventory" /> + <menu_item_call.on_enable + function="Tools.EnableSaveToInventory" /> + </menu_item_call> + <menu_item_call + label="Save Back to Object Contents" + layout="topleft" + name="Save Object Back to Object Contents"> + <menu_item_call.on_click + function="Tools.SaveToObjectInventory" /> + <menu_item_call.on_enable + function="Tools.EnableSaveToObjectInventory" /> + </menu_item_call> + </menu> + <menu + create_jump_keys="true" + label="Scripts" + layout="topleft" + name="Scripts" + tear_off="true"> + <menu_item_call + label="Recompile Scripts (Mono)" + layout="topleft" + name="Mono"> + <menu_item_call.on_click + function="Tools.SelectedScriptAction" + parameter="compile mono" /> + <menu_item_call.on_enable + function="EditableSelectedMono" /> + </menu_item_call> + <menu_item_call + label="Recompile Scripts (LSL)" + layout="topleft" + name="LSL"> + <menu_item_call.on_click + function="Tools.SelectedScriptAction" + parameter="compile lsl" /> + <menu_item_call.on_enable + function="EditableSelected" /> + </menu_item_call> + <menu_item_call + label="Reset Scripts" + layout="topleft" + name="Reset Scripts"> + <menu_item_call.on_click + function="Tools.SelectedScriptAction" + parameter="reset" /> + <menu_item_call.on_enable + function="EditableSelected" /> + </menu_item_call> + <menu_item_call + label="Set Scripts to Running" + layout="topleft" + name="Set Scripts to Running"> + <menu_item_call.on_click + function="Tools.SelectedScriptAction" + parameter="start" /> + <menu_item_call.on_enable + function="EditableSelected" /> + </menu_item_call> + <menu_item_call + label="Set Scripts to Not Running" + layout="topleft" + name="Set Scripts to Not Running"> + <menu_item_call.on_click + function="Tools.SelectedScriptAction" + parameter="stop" /> + <menu_item_call.on_enable + function="EditableSelected" /> + </menu_item_call> + </menu> + <menu_item_separator + layout="topleft" /> + <menu + create_jump_keys="true" + label="Options" + layout="topleft" + name="Options" + tear_off="true"> + <menu_item_check + label="Edit Linked Parts" + layout="topleft" + name="Edit Linked Parts"> + <menu_item_check.on_check + control="EditLinkedParts" /> + <menu_item_check.on_click + function="Tools.EditLinkedParts" + parameter="EditLinkedParts" /> + <menu_item_check.on_enable + function="Tools.EnableToolNotPie" /> + </menu_item_check> + <menu_item_call + label="Set Default Upload Permissions" + layout="topleft" + name="perm prefs"> + <menu_item_call.on_click + function="Floater.Toggle" + parameter="perm_prefs" /> + </menu_item_call> + <menu_item_check + label="Show Advanced Permissions" + layout="topleft" + name="DebugPermissions"> + <menu_item_check.on_check + function="CheckControl" + parameter="DebugPermissions" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="DebugPermissions" /> + </menu_item_check> + <!--menu_item_call + label="Show Script Warning/Error Window" + layout="topleft" + name="Show Script Warning/Error Window"> + <menu_item_call.on_click + function="ShowFloater" + parameter="script errors" /> + </menu_item_call--> + <menu_item_separator + layout="topleft" /> + <menu + create_jump_keys="true" + label="Selection" + layout="topleft" + name="Selection" + tear_off="true"> + <menu_item_check + label="Select Only My Objects" + layout="topleft" + name="Select Only My Objects"> + <menu_item_check.on_check + control="SelectOwnedOnly" /> + <menu_item_check.on_click + function="Tools.SelectOnlyMyObjects" + parameter="agents" /> + </menu_item_check> + <menu_item_check + label="Select Only Movable Objects" + layout="topleft" + name="Select Only Movable Objects"> + <menu_item_check.on_check + control="SelectMovableOnly" /> + <menu_item_check.on_click + function="Tools.SelectOnlyMovableObjects" + parameter="movable" /> + </menu_item_check> + <menu_item_check + label="Select By Surrounding" + layout="topleft" + name="Select By Surrounding"> + <menu_item_check.on_check + control="RectangleSelectInclusive" /> + <menu_item_check.on_click + function="Tools.SelectBySurrounding" /> + </menu_item_check> + </menu> + <menu + create_jump_keys="true" + label="Show" + layout="topleft" + name="Show" + tear_off="true"> + <menu_item_check + label="Show Hidden Selection" + layout="topleft" + name="Show Hidden Selection"> + <menu_item_check.on_check + control="RenderHiddenSelections" /> + <menu_item_check.on_click + function="Tools.ShowHiddenSelection" /> + </menu_item_check> + <menu_item_check + label="Show Light Radius for Selection" + layout="topleft" + name="Show Light Radius for Selection"> + <menu_item_check.on_check + control="RenderLightRadius" /> + <menu_item_check.on_click + function="Tools.ShowSelectionLightRadius" /> + </menu_item_check> + <menu_item_check + label="Show Selection Beam" + layout="topleft" + name="Show Selection Beam"> + <menu_item_check.on_check + control="ShowSelectionBeam" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="ShowSelectionBeam" /> + </menu_item_check> + </menu> + <menu + create_jump_keys="true" + label="Grid" + layout="topleft" + name="Grid" + tear_off="true"> + <menu_item_check + label="Snap to Grid" + layout="topleft" + name="Snap to Grid" + shortcut="G"> + <menu_item_check.on_check + control="SnapEnabled" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="SnapEnabled" /> + <menu_item_check.on_enable + function="Tools.EnableToolNotPie" /> + </menu_item_check> + <menu_item_call + label="Snap Object XY to Grid" + layout="topleft" + name="Snap Object XY to Grid" + shortcut="shift|X"> + <menu_item_call.on_click + function="Tools.SnapObjectXY" /> + <menu_item_call.on_enable + function="Tools.EnableToolNotPie" /> + </menu_item_call> + <menu_item_call + label="Use Selection for Grid" + layout="topleft" + name="Use Selection for Grid" + shortcut="shift|G"> + <menu_item_call.on_click + function="Tools.UseSelectionForGrid" /> + <menu_item_call.on_enable + function="SomethingSelected" /> + </menu_item_call> + <menu_item_call + label="Grid Options" + layout="topleft" + name="Grid Options" + shortcut="control|shift|B"> + <menu_item_call.on_click + function="Floater.Show" + parameter="build_options" /> + <menu_item_call.on_enable + function="Tools.EnableToolNotPie" /> + </menu_item_call> + </menu> + </menu> + <menu + create_jump_keys="true" + label="Select Linked Parts" + layout="topleft" + name="Select Linked Parts" + tear_off="true"> + <menu_item_call + label="Select Next Part" + layout="topleft" + name="Select Next Part" + shortcut="control|."> + <menu_item_call.on_click + function="Tools.SelectNextPart" + parameter="next" /> + <menu_item_call.on_enable + function="Tools.EnableSelectNextPart" /> + </menu_item_call> + <menu_item_call + label="Select Previous Part" + layout="topleft" + name="Select Previous Part" + shortcut="control|,"> + <menu_item_call.on_click + function="Tools.SelectNextPart" + parameter="previous" /> + <menu_item_call.on_enable + function="Tools.EnableSelectNextPart" /> + </menu_item_call> + <menu_item_call + label="Include Next Part" + layout="topleft" + name="Include Next Part" + shortcut="control|shift|."> + <menu_item_call.on_click + function="Tools.SelectNextPart" + parameter="includenext" /> + <menu_item_call.on_enable + function="Tools.EnableSelectNextPart" /> + </menu_item_call> + <menu_item_call + label="Include Previous Part" + layout="topleft" + name="Include Previous Part" + shortcut="control|shift|,"> + <menu_item_call.on_click + function="Tools.SelectNextPart" + parameter="includeprevious" /> + <menu_item_call.on_enable + function="Tools.EnableSelectNextPart" /> + </menu_item_call> + </menu> + </menu> + <menu + label="Help" + layout="topleft" + name="Help" + tear_off="true"> + <menu_item_call + label="[SECOND_LIFE] Help" + layout="topleft" + name="Second Life Help" + shortcut="F1"> + <menu_item_call.on_click + function="ShowFloater" + parameter="help f1" /> + </menu_item_call> + <menu_item_call + label="Tutorial" + layout="topleft" + name="Tutorial"> + <menu_item_call.on_click + function="Floater.Show" + parameter="hud" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Report Abuse" + layout="topleft" + name="Report Abuse"> + <menu_item_call.on_click + function="ShowFloater" + parameter="complaint reporter" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="About [APP_NAME]" + layout="topleft" + name="About Second Life"> + <menu_item_call.on_click + function="Floater.Show" + parameter="sl_about" /> + </menu_item_call> + </menu> + <menu + label="Advanced" + layout="topleft" + name="Advanced" + tear_off="true" + visible="false"> + <menu_item_check + label="Set Away After 30 Minutes" + layout="topleft" + name="Go Away/AFK When Idle"> + <menu_item_check.on_check + function="CheckControl" + parameter="AllowIdleAFK" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="AllowIdleAFK" /> + </menu_item_check> + <menu_item_call + label="Stop Animating Me" + layout="topleft" + name="Stop Animating My Avatar"> + <menu_item_call.on_click + function="Tools.StopAllAnimations" /> + </menu_item_call> + <menu_item_call + label="Rebake Textures" + layout="topleft" + name="Rebake Texture" + shortcut="control|alt|R"> + <menu_item_call.on_click + function="Advanced.RebakeTextures" /> + </menu_item_call> + <menu_item_call + label="Set UI Size to Default" + layout="topleft" + name="Set UI Size to Default"> + <menu_item_call.on_click + function="View.DefaultUISize" /> + </menu_item_call> + <menu_item_separator/> + <menu_item_check + label="Limit Select Distance" + layout="topleft" + name="Limit Select Distance"> + <menu_item_check.on_check + function="CheckControl" + parameter="LimitSelectDistance" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="LimitSelectDistance" /> + </menu_item_check> + <menu_item_check + label="Disable Camera Constraints" + layout="topleft" + name="Disable Camera Distance"> + <menu_item_check.on_check + function="CheckControl" + parameter="DisableCameraConstraints" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="DisableCameraConstraints" /> + </menu_item_check> + <menu_item_separator + layout="topleft" /> + <menu_item_check + label="High-res Snapshot" + layout="topleft" + name="HighResSnapshot"> + <menu_item_check.on_check + function="CheckControl" + parameter="HighResSnapshot" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="HighResSnapshot" /> + </menu_item_check> + <menu_item_check + label="Quiet Snapshots to Disk" + layout="topleft" + name="QuietSnapshotsToDisk"> + <menu_item_check.on_check + function="CheckControl" + parameter="QuietSnapshotsToDisk" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="QuietSnapshotsToDisk" /> + </menu_item_check> + <menu_item_check + label="Compress Snapshots to Disk" + layout="topleft" + name="CompressSnapshotsToDisk"> + <menu_item_check.on_check + function="CheckControl" + parameter="CompressSnapshotsToDisk" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="CompressSnapshotsToDisk" /> + </menu_item_check> + <menu_item_call + label="Save Texture As" + layout="topleft" + name="Save Texture As"> + <menu_item_call.on_click + function="File.SaveTexture" /> + <menu_item_call.on_enable + function="File.EnableSaveAs" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu + create_jump_keys="true" + label="Performance Tools" + layout="topleft" + name="Performance Tools" + tear_off="true"> + <menu_item_call + label="Lag Meter" + layout="topleft" + name="Lag Meter"> + <menu_item_call.on_click + function="Floater.Show" + parameter="lagmeter" /> + </menu_item_call> + <menu_item_check + label="Statistics Bar" + layout="topleft" + name="Statistics Bar" + shortcut="control|shift|1"> + <menu_item_check.on_check + function="Floater.Visible" + parameter="stats" /> + <menu_item_check.on_click + function="Floater.Toggle" + parameter="stats" /> + </menu_item_check> + <menu_item_check + label="Show Avatar Rendering Cost" + layout="topleft" + name="Avatar Rendering Cost"> + <menu_item_check.on_check + function="Advanced.CheckInfoDisplay" + parameter="shame" /> + <menu_item_check.on_click + function="Advanced.ToggleInfoDisplay" + parameter="shame" /> + </menu_item_check> + </menu> + <menu + create_jump_keys="true" + label="Highlighting and Visibility" + layout="topleft" + name="Highlighting and Visibility" + tear_off="true"> + <menu_item_check + label="Cheesy Beacon" + layout="topleft" + name="Cheesy Beacon"> + <menu_item_check.on_check + function="CheckControl" + parameter="CheesyBeacon" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="CheesyBeacon" /> + </menu_item_check> + <menu_item_check + label="Hide Particles" + layout="topleft" + name="Hide Particles" + shortcut="control|alt|shift|="> + <menu_item_check.on_check + function="View.CheckRenderType" + parameter="hideparticles" /> + <menu_item_check.on_click + function="View.ToggleRenderType" + parameter="hideparticles" /> + </menu_item_check> + <menu_item_check + label="Hide Selected" + layout="topleft" + name="Hide Selected"> + <menu_item_check.on_check + function="CheckControl" + parameter="HideSelectedObjects" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="HideSelectedObjects" /> + </menu_item_check> + <menu_item_check + label="Highlight Transparent" + layout="topleft" + name="Highlight Transparent" + shortcut="control|alt|T"> + <menu_item_check.on_check + function="View.CheckHighlightTransparent" /> + <menu_item_check.on_click + function="View.HighlightTransparent" /> + </menu_item_check> + <menu_item_check + label="Show HUD Attachments" + layout="topleft" + name="Show HUD Attachments" + shortcut="alt|shift|H"> + <menu_item_check.on_check + function="View.CheckHUDAttachments" /> + <menu_item_check.on_click + function="View.ShowHUDAttachments" /> + </menu_item_check> + <menu_item_check + label="Show Mouselook Crosshairs" + layout="topleft" + name="ShowCrosshairs"> + <menu_item_check.on_check + function="CheckControl" + parameter="ShowCrosshairs" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="ShowCrosshairs" /> + </menu_item_check> + <!-- <menu + create_jump_keys="true" + label="Hover Tips" + layout="topleft" + name="Hover Tips" + tear_off="true"> + <menu_item_check + label="Show Tips" + layout="topleft" + name="Show Tips" + shortcut="control|shift|T"> + <menu_item_check.on_check + function="View.CheckShowHoverTips" /> + <menu_item_check.on_click + function="View.ShowHoverTips" /> + </menu_item_check> + <menu_item_separator + layout="topleft" />--> + <menu_item_check + label="Show Land Tooltips" + layout="topleft" + name="Land Tips"> + <menu_item_check.on_check + control="ShowLandHoverTip" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="ShowLandHoverTip" /> + <menu_item_check.on_enable + function="View.CheckShowHoverTips" /> + </menu_item_check> + <!-- <menu_item_check + label="Show Tips On All Objects" + layout="topleft" + name="Tips On All Objects"> + <menu_item_check.on_check + control="ShowAllObjectHoverTip" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="ShowAllObjectHoverTip" /> + <menu_item_check.on_enable + function="View.CheckShowHoverTips" /> + </menu_item_check> + </menu>--> + + </menu> + + <menu + create_jump_keys="true" + label="Rendering Types" + layout="topleft" + name="Rendering Types" + tear_off="true"> + <menu_item_check + label="Simple" + layout="topleft" + name="Simple" + shortcut="control|alt|shift|1"> + <menu_item_check.on_check + function="Advanced.CheckRenderType" + parameter="simple" /> + <menu_item_check.on_click + function="Advanced.ToggleRenderType" + parameter="simple" /> + </menu_item_check> + <menu_item_check + label="Alpha" + layout="topleft" + name="Alpha" + shortcut="control|alt|shift|2"> + <menu_item_check.on_check + function="Advanced.CheckRenderType" + parameter="alpha" /> + <menu_item_check.on_click + function="Advanced.ToggleRenderType" + parameter="alpha" /> + </menu_item_check> + <menu_item_check + label="Tree" + layout="topleft" + name="Tree" + shortcut="control|alt|shift|3"> + <menu_item_check.on_check + function="Advanced.CheckRenderType" + parameter="tree" /> + <menu_item_check.on_click + function="Advanced.ToggleRenderType" + parameter="tree" /> + </menu_item_check> + <menu_item_check + label="Avatars" + layout="topleft" + name="Character" + shortcut="control|alt|shift|4"> + <menu_item_check.on_check + function="Advanced.CheckRenderType" + parameter="character" /> + <menu_item_check.on_click + function="Advanced.ToggleRenderType" + parameter="character" /> + </menu_item_check> + <menu_item_check + label="SurfacePath" + layout="topleft" + name="SurfacePath" + shortcut="control|alt|shift|5"> + <menu_item_check.on_check + function="Advanced.CheckRenderType" + parameter="surfacePath" /> + <menu_item_check.on_click + function="Advanced.ToggleRenderType" + parameter="surfacePath" /> + </menu_item_check> + <menu_item_check + label="Sky" + layout="topleft" + name="Sky" + shortcut="control|alt|shift|6"> + <menu_item_check.on_check + function="Advanced.CheckRenderType" + parameter="sky" /> + <menu_item_check.on_click + function="Advanced.ToggleRenderType" + parameter="sky" /> + </menu_item_check> + <menu_item_check + label="Water" + layout="topleft" + name="Water" + shortcut="control|alt|shift|7"> + <menu_item_check.on_check + function="Advanced.CheckRenderType" + parameter="water" /> + <menu_item_check.on_click + function="Advanced.ToggleRenderType" + parameter="water" /> + </menu_item_check> + <menu_item_check + label="Ground" + layout="topleft" + name="Ground" + shortcut="control|alt|shift|8"> + <menu_item_check.on_check + function="Advanced.CheckRenderType" + parameter="ground" /> + <menu_item_check.on_click + function="Advanced.ToggleRenderType" + parameter="ground" /> + </menu_item_check> + <menu_item_check + label="Volume" + layout="topleft" + name="Volume" + shortcut="control|alt|shift|9"> + <menu_item_check.on_check + function="Advanced.CheckRenderType" + parameter="volume" /> + <menu_item_check.on_click + function="Advanced.ToggleRenderType" + parameter="volume" /> + </menu_item_check> + <menu_item_check + label="Grass" + layout="topleft" + name="Grass" + shortcut="control|alt|shift|0"> + <menu_item_check.on_check + function="Advanced.CheckRenderType" + parameter="grass" /> + <menu_item_check.on_click + function="Advanced.ToggleRenderType" + parameter="grass" /> + </menu_item_check> + <menu_item_check + label="Clouds" + layout="topleft" + name="Clouds" + shortcut="control|alt|shift|-"> + <menu_item_check.on_check + function="Advanced.CheckRenderType" + parameter="clouds" /> + <menu_item_check.on_click + function="Advanced.ToggleRenderType" + parameter="clouds" /> + </menu_item_check> + <menu_item_check + label="Particles" + layout="topleft" + name="Particles" + shortcut="control|alt|shift|="> + <menu_item_check.on_check + function="Advanced.CheckRenderType" + parameter="particles" /> + <menu_item_check.on_click + function="Advanced.ToggleRenderType" + parameter="particles" /> + </menu_item_check> + <menu_item_check + label="Bump" + layout="topleft" + name="Bump" + shortcut="control|alt|shift|\"> + <menu_item_check.on_check + function="Advanced.CheckRenderType" + parameter="bump" /> + <menu_item_check.on_click + function="Advanced.ToggleRenderType" + parameter="bump" /> + </menu_item_check> + </menu> + <menu + create_jump_keys="true" + label="Rendering Features" + layout="topleft" + name="Rendering Features" + tear_off="true"> + <menu_item_check + label="UI" + layout="topleft" + name="UI" + shortcut="control|alt|F1"> + <menu_item_check.on_check + function="Advanced.CheckFeature" + parameter="ui" /> + <menu_item_check.on_click + function="Advanced.ToggleFeature" + parameter="ui" /> + </menu_item_check> + <menu_item_check + label="Selected" + layout="topleft" + name="Selected" + shortcut="control|alt|F2"> + <menu_item_check.on_check + function="Advanced.CheckFeature" + parameter="selected" /> + <menu_item_check.on_click + function="Advanced.ToggleFeature" + parameter="selected" /> + </menu_item_check> + <menu_item_check + label="Highlighted" + layout="topleft" + name="Highlighted" + shortcut="control|alt|F3"> + <menu_item_check.on_check + function="Advanced.CheckFeature" + parameter="highlighted" /> + <menu_item_check.on_click + function="Advanced.ToggleFeature" + parameter="highlighted" /> + </menu_item_check> + <menu_item_check + label="Dynamic Textures" + layout="topleft" + name="Dynamic Textures" + shortcut="control|alt|F4"> + <menu_item_check.on_check + function="Advanced.CheckFeature" + parameter="dynamic textures" /> + <menu_item_check.on_click + function="Advanced.ToggleFeature" + parameter="dynamic textures" /> + </menu_item_check> + <menu_item_check + label="Foot Shadows" + layout="topleft" + name="Foot Shadows" + shortcut="control|alt|F5"> + <menu_item_check.on_check + function="Advanced.CheckFeature" + parameter="foot shadows" /> + <menu_item_check.on_click + function="Advanced.ToggleFeature" + parameter="foot shadows" /> + </menu_item_check> + <menu_item_check + label="Fog" + layout="topleft" + name="Fog" + shortcut="control|alt|F6"> + <menu_item_check.on_check + function="Advanced.CheckFeature" + parameter="fog" /> + <menu_item_check.on_click + function="Advanced.ToggleFeature" + parameter="fog" /> + </menu_item_check> + <menu_item_check + label="Test FRInfo" + layout="topleft" + name="Test FRInfo" + shortcut="control|alt|F8"> + <menu_item_check.on_check + function="Advanced.CheckFeature" + parameter="fr info" /> + <menu_item_check.on_click + function="Advanced.ToggleFeature" + parameter="fr info" /> + </menu_item_check> + <menu_item_check + label="Flexible Objects" + layout="topleft" + name="Flexible Objects" + shortcut="control|alt|F9"> + <menu_item_check.on_check + function="Advanced.CheckFeature" + parameter="flexible" /> + <menu_item_check.on_click + function="Advanced.ToggleFeature" + parameter="flexible" /> + </menu_item_check> + </menu> + <menu_item_check + label="Run Multiple Threads" + layout="topleft" + name="Run Multiple Threads"> + <menu_item_check.on_check + function="CheckControl" + parameter="RunMultipleThreads" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="RunMultipleThreads" /> + </menu_item_check> + <menu_item_call + label="Clear Group Cache" + layout="topleft" + name="ClearGroupCache"> + <menu_item_call.on_click + function="Advanced.ClearGroupCache" + parameter="ClearGroupCache" /> + </menu_item_call> + <menu_item_check + label="Mouse Smoothing" + layout="topleft" + name="Mouse Smoothing"> + <menu_item_check.on_check + function="CheckControl" + parameter="MouseSmooth" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="MouseSmooth" /> + </menu_item_check> + <menu_item_check + label="Show IMs in Nearby Chat" + layout="topleft" + name="IMInChat"> + <menu_item_check.on_check + function="CheckControl" + parameter="IMInChat" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="IMInChat" /> + </menu_item_check> + <menu_item_separator + layout="topleft" /> + <menu + label="Shortcuts" + layout="topleft" + name="Shortcuts" + tear_off="true" + visible="false"> + <menu_item_check + label="Search" + layout="topleft" + name="Search" + shortcut="control|F"> + <menu_item_check.on_check + function="Floater.Visible" + parameter="search" /> + <menu_item_check.on_click + function="Floater.Toggle" + parameter="search" /> + </menu_item_check> + <menu_item_call + enabled="false" + label="Release Keys" + layout="topleft" + 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" + layout="topleft" + name="Set UI Size to Default"> + <menu_item_call.on_click + function="View.DefaultUISize" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_check + label="Always Run" + layout="topleft" + 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_check + label="Fly" + layout="topleft" + 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_separator + layout="topleft" /> + <menu_item_call + label="Close Window" + layout="topleft" + name="Close Window" + shortcut="control|W"> + <menu_item_call.on_click + function="File.CloseWindow" /> + <menu_item_call.on_enable + function="File.EnableCloseWindow" /> + </menu_item_call> + <menu_item_call + label="Close All Windows" + layout="topleft" + name="Close All Windows" + shortcut="control|shift|W"> + <menu_item_call.on_click + function="File.CloseAllWindows" /> + <menu_item_call.on_enable + function="File.EnableCloseAllWindows" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Snapshot to Disk" + layout="topleft" + name="Snapshot to Disk" + shortcut="control|`" + use_mac_ctrl="true"> + <menu_item_call.on_click + function="File.TakeSnapshotToDisk" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Mouselook" + layout="topleft" + name="Mouselook" + shortcut="M"> + <menu_item_call.on_click + function="View.Mouselook" /> + <menu_item_call.on_enable + function="View.EnableMouselook" /> + </menu_item_call> + <menu_item_check + label="Joystick Flycam" + layout="topleft" + name="Joystick Flycam" + shortcut="alt|shift|F"> + <menu_item_check.on_check + function="View.CheckJoystickFlycam" /> + <menu_item_check.on_click + function="View.JoystickFlycam" /> + <menu_item_check.on_enable + function="View.EnableJoystickFlycam" /> + </menu_item_check> + <menu_item_call + label="Reset View" + layout="topleft" + name="Reset View" + shortcut="Esc"> + <menu_item_call.on_click + function="View.ResetView" /> + </menu_item_call> + <menu_item_call + label="Look at Last Chatter" + layout="topleft" + name="Look at Last Chatter" + shortcut="control|\"> + <menu_item_call.on_click + function="View.LookAtLastChatter" /> + <menu_item_call.on_enable + function="View.EnableLastChatter" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu + create_jump_keys="true" + label="Select Build Tool" + layout="topleft" + name="Select Tool" + tear_off="true"> + <menu_item_call + label="Focus Tool" + layout="topleft" + name="Focus" + shortcut="control|1"> + <menu_item_call.on_click + function="Tools.SelectTool" + parameter="focus" /> + </menu_item_call> + <menu_item_call + label="Move Tool" + layout="topleft" + name="Move" + shortcut="control|2"> + <menu_item_call.on_click + function="Tools.SelectTool" + parameter="move" /> + </menu_item_call> + <menu_item_call + label="Edit Tool" + layout="topleft" + name="Edit" + shortcut="control|3"> + <menu_item_call.on_click + function="Tools.SelectTool" + parameter="edit" /> + </menu_item_call> + <menu_item_call + label="Create Tool" + layout="topleft" + name="Create" + shortcut="control|4"> + <menu_item_call.on_click + function="Tools.SelectTool" + parameter="create" /> + </menu_item_call> + <menu_item_call + label="Land Tool" + layout="topleft" + name="Land" + shortcut="control|5"> + <menu_item_call.on_click + function="Tools.SelectTool" + parameter="land" /> + </menu_item_call> + </menu> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Zoom In" + layout="topleft" + name="Zoom In" + shortcut="control|0"> + <menu_item_call.on_click + function="View.ZoomIn" /> + </menu_item_call> + <menu_item_call + label="Zoom Default" + layout="topleft" + name="Zoom Default" + shortcut="control|9"> + <menu_item_call.on_click + function="View.ZoomDefault" /> + </menu_item_call> + <menu_item_call + label="Zoom Out" + layout="topleft" + name="Zoom Out" + shortcut="control|8"> + <menu_item_call.on_click + function="View.ZoomOut" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Toggle Fullscreen" + layout="topleft" + name="Toggle Fullscreen" + > + <!-- Note: shortcut="alt|Enter" was deleted from the preceding node--> + <menu_item_call.on_click + function="View.Fullscreen" /> + </menu_item_call> + </menu> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Show Debug Settings" + layout="topleft" + name="Debug Settings"> + <menu_item_call.on_click + function="Advanced.ShowDebugSettings" + parameter="all" /> + </menu_item_call> + <menu_item_check + label="Show Develop Menu" + layout="topleft" + name="Debug Mode" + shortcut="control|alt|Q"> + <menu_item_check.on_check + function="CheckControl" + parameter="QAMode" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="QAMode" /> + </menu_item_check> + </menu> + <menu + create_jump_keys="true" + label="Develop" + layout="topleft" + name="Develop" + tear_off="true" + visible="false"> + <menu + create_jump_keys="true" + label="Consoles" + layout="topleft" + name="Consoles" + tear_off="true"> + <menu_item_check + label="Texture Console" + layout="topleft" + name="Texture Console" + shortcut="control|shift|3" + use_mac_ctrl="true"> + <menu_item_check.on_check + function="Advanced.CheckConsole" + parameter="texture" /> + <menu_item_check.on_click + function="Advanced.ToggleConsole" + parameter="texture" /> + </menu_item_check> + <menu_item_check + label="Debug Console" + layout="topleft" + name="Debug Console" + shortcut="control|shift|4" + use_mac_ctrl="true"> + <menu_item_check.on_check + function="Advanced.CheckConsole" + parameter="debug" /> + <menu_item_check.on_click + function="Advanced.ToggleConsole" + parameter="debug" /> + </menu_item_check> + <menu_item_call + label="Notifications Console" + layout="topleft" + name="Notifications" + shortcut="control|shift|5"> + <menu_item_call.on_click + function="Floater.Toggle" + parameter="notifications_console" /> + </menu_item_call> + <menu_item_check + label="Texture Size Console" + layout="topleft" + name="Texture Size" + shortcut="control|shift|6"> + <menu_item_check.on_check + function="Advanced.CheckConsole" + parameter="texture size" /> + <menu_item_check.on_click + function="Advanced.ToggleConsole" + parameter="texture size" /> + </menu_item_check> + <menu_item_check + label="Texture Category Console" + layout="topleft" + name="Texture Category" + shortcut="control|shift|7"> + <menu_item_check.on_check + function="Advanced.CheckConsole" + parameter="texture category" /> + <menu_item_check.on_click + function="Advanced.ToggleConsole" + parameter="texture category" /> + </menu_item_check> + <menu_item_check + label="Fast Timers" + layout="topleft" + name="Fast Timers" + shortcut="control|shift|9" + use_mac_ctrl="true"> + <menu_item_check.on_check + function="Advanced.CheckConsole" + parameter="fast timers" /> + <menu_item_check.on_click + function="Advanced.ToggleConsole" + parameter="fast timers" /> + </menu_item_check> + <menu_item_check + label="Memory" + layout="topleft" + name="Memory" + shortcut="control|shift|0" + use_mac_ctrl="true"> + <menu_item_check.on_check + function="Advanced.CheckConsole" + parameter="memory view" /> + <menu_item_check.on_click + function="Advanced.ToggleConsole" + parameter="memory view" /> + </menu_item_check> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Region Info to Debug Console" + layout="topleft" + name="Region Info to Debug Console"> + <menu_item_call.on_click + function="Advanced.DumpInfoToConsole" + parameter="region" /> + </menu_item_call> + <menu_item_call + label="Group Info to Debug Console" + layout="topleft" + name="Group Info to Debug Console"> + <menu_item_call.on_click + function="Advanced.DumpInfoToConsole" + parameter="group" /> + </menu_item_call> + <menu_item_call + label="Capabilities Info to Debug Console" + layout="topleft" + name="Capabilities Info to Debug Console"> + <menu_item_call.on_click + function="Advanced.DumpInfoToConsole" + parameter="capabilities" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_check + label="Camera" + layout="topleft" + name="Camera"> + <menu_item_check.on_check + function="Advanced.CheckHUDInfo" + parameter="camera" /> + <menu_item_check.on_click + function="Advanced.ToggleHUDInfo" + parameter="camera" /> + </menu_item_check> + <menu_item_check + label="Wind" + layout="topleft" + name="Wind"> + <menu_item_check.on_check + function="Advanced.CheckHUDInfo" + parameter="wind" /> + <menu_item_check.on_click + function="Advanced.ToggleHUDInfo" + parameter="wind" /> + </menu_item_check> + <menu_item_check + label="FOV" + layout="topleft" + name="FOV"> + <menu_item_check.on_check + function="Advanced.CheckHUDInfo" + parameter="fov" /> + <menu_item_check.on_click + function="Advanced.ToggleHUDInfo" + parameter="fov" /> + </menu_item_check> + </menu> + <menu + create_jump_keys="true" + label="Show Info" + layout="topleft" + name="Display Info" + tear_off="true"> + <menu_item_check + label="Show Time" + layout="topleft" + name="Show Time"> + <menu_item_check.on_check + function="CheckControl" + parameter="DebugShowTime" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="DebugShowTime" /> + </menu_item_check> + <menu_item_check + label="Show Render Info" + layout="topleft" + name="Show Render Info"> + <menu_item_check.on_check + function="CheckControl" + parameter="DebugShowRenderInfo" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="DebugShowRenderInfo" /> + </menu_item_check> + <menu_item_check + label="Show Matrices" + layout="topleft" + name="Show Matrices"> + <menu_item_check.on_check + function="CheckControl" + parameter="DebugShowRenderMatrices" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="DebugShowRenderMatrices" /> + </menu_item_check> + <menu_item_check + label="Show Color Under Cursor" + layout="topleft" + name="Show Color Under Cursor"> + <menu_item_check.on_check + function="CheckControl" + parameter="DebugShowColor" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="DebugShowColor" /> + </menu_item_check> + <menu_item_separator + layout="topleft" /> + <menu_item_check + label="Show Updates to Objects" + layout="topleft" + name="Show Updates" + shortcut="control|alt|shift|U"> + <menu_item_check.on_check + function="Advanced.CheckShowObjectUpdates" + parameter="ObjectUpdates" /> + <menu_item_check.on_click + function="Advanced.ToggleShowObjectUpdates" /> + </menu_item_check> + </menu> + <menu_item_separator + layout="topleft" /> + <menu + create_jump_keys="true" + label="Force an Error" + layout="topleft" + name="Force Errors" + tear_off="true"> + <menu_item_call + label="Force Breakpoint" + layout="topleft" + name="Force Breakpoint" + shortcut="control|alt|shift|B"> + <menu_item_call.on_click + function="Advanced.ForceErrorBreakpoint" /> + </menu_item_call> + <menu_item_call + label="Force LLError And Crash" + layout="topleft" + name="Force LLError And Crash"> + <menu_item_call.on_click + function="Advanced.ForceErrorLlerror" /> + </menu_item_call> + <menu_item_call + label="Force Bad Memory Access" + layout="topleft" + name="Force Bad Memory Access"> + <menu_item_call.on_click + function="Advanced.ForceErrorBadMemoryAccess" /> + </menu_item_call> + <menu_item_call + label="Force Infinite Loop" + layout="topleft" + name="Force Infinite Loop"> + <menu_item_call.on_click + function="Advanced.ForceErrorInfiniteLoop" /> + </menu_item_call> + <menu_item_call + label="Force Driver Crash" + layout="topleft" + name="Force Driver Carsh"> + <menu_item_call.on_click + function="Advanced.ForceErrorDriverCrash" /> + </menu_item_call> + <menu_item_call + label="Force Software Exception" + layout="topleft" + name="Force Software Exception"> + <menu_item_call.on_click + function="Advanced.ForceErrorSoftwareException" /> + </menu_item_call> + <menu_item_call + label="Force Disconnect Viewer" + layout="topleft" + name="Force Disconnect Viewer"> + <menu_item_call.on_click + function="Advanced.ForceErrorDisconnectViewer" /> + </menu_item_call> + <menu_item_call + label="Simulate a Memory Leak" + layout="topleft" + name="Memory Leaking Simulation"> + <menu_item_call.on_click + function="Floater.Show" + parameter="mem_leaking" /> + </menu_item_call> + </menu> + <menu + create_jump_keys="true" + label="Render Tests" + layout="topleft" + name="Render Tests" + tear_off="true"> + <menu_item_check + label="Camera Offset" + layout="topleft" + name="Camera Offset"> + <menu_item_check.on_check + function="CheckControl" + parameter="CameraOffset" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="CameraOffset" /> + </menu_item_check> + <menu_item_check + label="Randomize Framerate" + layout="topleft" + name="Randomize Framerate"> + <menu_item_check.on_check + function="Advanced.CheckRandomizeFramerate" + parameter="Randomize Framerate" /> + <menu_item_check.on_click + function="Advanced.ToggleRandomizeFramerate" /> + </menu_item_check> + <menu_item_check + label="Periodic Slow Frame" + layout="topleft" + name="Periodic Slow Frame"> + <menu_item_check.on_check + function="Advanced.CheckPeriodicSlowFrame" + parameter="points" /> + <menu_item_check.on_click + function="Advanced.TogglePeriodicSlowFrame" + parameter="points" /> + </menu_item_check> + <menu_item_check + label="Frame Test" + layout="topleft" + name="Frame Test"> + <menu_item_check.on_check + function="Advanced.CheckFrameTest" + parameter="Frame Test" /> + <menu_item_check.on_click + function="Advanced.ToggleFrameTest" /> + </menu_item_check> + </menu> + <menu + create_jump_keys="true" + label="Render Metadata" + layout="topleft" + name="Render Metadata" + tear_off="true"> + <menu_item_check + label="Bounding Boxes" + layout="topleft" + name="Bounding Boxes"> + <menu_item_check.on_check + function="Advanced.CheckInfoDisplay" + parameter="bboxes" /> + <menu_item_check.on_click + function="Advanced.ToggleInfoDisplay" + parameter="bboxes" /> + </menu_item_check> + <menu_item_check + label="Octree" + layout="topleft" + name="Octree"> + <menu_item_check.on_check + function="Advanced.CheckInfoDisplay" + parameter="octree" /> + <menu_item_check.on_click + function="Advanced.ToggleInfoDisplay" + parameter="octree" /> + </menu_item_check> + <menu_item_check + label="Shadow Frusta" + layout="topleft" + name="Shadow Frusta"> + <menu_item_check.on_check + function="Advanced.CheckInfoDisplay" + parameter="shadow frusta" /> + <menu_item_check.on_click + function="Advanced.ToggleInfoDisplay" + parameter="shadow frusta" /> + </menu_item_check> + <menu_item_check + label="Occlusion" + layout="topleft" + name="Occlusion"> + <menu_item_check.on_check + function="Advanced.CheckInfoDisplay" + parameter="occlusion" /> + <menu_item_check.on_click + function="Advanced.ToggleInfoDisplay" + parameter="occlusion" /> + </menu_item_check> + <menu_item_check + label="Render Batches" + layout="topleft" + name="Render Batches"> + <menu_item_check.on_check + function="Advanced.CheckInfoDisplay" + parameter="render batches" /> + <menu_item_check.on_click + function="Advanced.ToggleInfoDisplay" + parameter="render batches" /> + </menu_item_check> + <menu_item_check + label="Texture Anim" + layout="topleft" + name="Texture Anim"> + <menu_item_check.on_check + function="Advanced.CheckInfoDisplay" + parameter="texture anim" /> + <menu_item_check.on_click + function="Advanced.ToggleInfoDisplay" + parameter="texture anim" /> + </menu_item_check> + <menu_item_check + label="Texture Priority" + layout="topleft" + name="Texture Priority"> + <menu_item_check.on_check + function="Advanced.CheckInfoDisplay" + parameter="texture priority" /> + <menu_item_check.on_click + function="Advanced.ToggleInfoDisplay" + parameter="texture priority" /> + </menu_item_check> + <menu_item_check + label="Texture Area" + layout="topleft" + name="Texture Area"> + <menu_item_check.on_check + function="Advanced.CheckInfoDisplay" + parameter="texture area" /> + <menu_item_check.on_click + function="Advanced.ToggleInfoDisplay" + parameter="texture area" /> + </menu_item_check> + <menu_item_check + label="Face Area" + layout="topleft" + name="Face Area"> + <menu_item_check.on_check + function="Advanced.CheckInfoDisplay" + parameter="face area" /> + <menu_item_check.on_click + function="Advanced.ToggleInfoDisplay" + parameter="face area" /> + </menu_item_check> + <menu_item_check + label="Lights" + layout="topleft" + name="Lights"> + <menu_item_check.on_check + function="Advanced.CheckInfoDisplay" + parameter="lights" /> + <menu_item_check.on_click + function="Advanced.ToggleInfoDisplay" + parameter="lights" /> + </menu_item_check> + <menu_item_check + label="Collision Skeleton" + layout="topleft" + name="Collision Skeleton"> + <menu_item_check.on_check + function="Advanced.CheckInfoDisplay" + parameter="collision skeleton" /> + <menu_item_check.on_click + function="Advanced.ToggleInfoDisplay" + parameter="collision skeleton" /> + </menu_item_check> + <menu_item_check + label="Raycast" + layout="topleft" + name="Raycast"> + <menu_item_check.on_check + function="Advanced.CheckInfoDisplay" + parameter="raycast" /> + <menu_item_check.on_click + function="Advanced.ToggleInfoDisplay" + parameter="raycast" /> + </menu_item_check> + </menu> + <menu + create_jump_keys="true" + label="Rendering" + layout="topleft" + name="Rendering" + tear_off="true"> + <menu_item_check + label="Axes" + name="Axes"> + <menu_item_check.on_check + function="CheckControl" + parameter="ShowAxes" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="ShowAxes" /> + </menu_item_check> + <menu_item_check + label="Tangent Basis" + name="Tangent Basis"> + <menu_item_check.on_check + function="CheckControl" + parameter="ShowTangentBasis" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="ShowTangentBasis" /> + </menu_item_check> + <menu_item_call + label="Selected Texture Info Basis" + name="Selected Texture Info Basis" + shortcut="control|alt|shift|T"> + <menu_item_call.on_click + function="Advanced.SelectedTextureInfo" /> + </menu_item_call> + <menu_item_check + label="Wireframe" + name="Wireframe" + shortcut="control|shift|R"> + <menu_item_check.on_check + function="Advanced.CheckWireframe" + parameter="Wireframe" /> + <menu_item_check.on_click + function="Advanced.ToggleWireframe" /> + </menu_item_check> + <menu_item_check + label="Object-Object Occlusion" + name="Object-Object Occlusion" + shortcut="control|shift|O"> + <menu_item_check.on_check + function="CheckControl" + parameter="UseOcclusion" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="UseOcclusion" /> + <menu_item_check.on_enable + function="Advanced.EnableObjectObjectOcclusion" /> + </menu_item_check> + <menu_item_check + label="Framebuffer Objects" + name="Framebuffer Objects"> + <menu_item_check.on_check + function="CheckControl" + parameter="RenderUseFBO" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="RenderUseFBO" /> + <menu_item_check.on_enable + function="Advanced.EnableRenderFBO" /> + </menu_item_check> + <menu_item_check + label="Deferred Rendering" + name="Deferred Rendering"> + <menu_item_check.on_check + function="CheckControl" + parameter="RenderDeferred" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="RenderDeferred" /> + <menu_item_check.on_enable + function="Advanced.EnableRenderDeferred" /> + </menu_item_check> + <menu_item_check + label="Global Illumination" + 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.EnableRenderDeferredGI" /> + </menu_item_check> + <menu_item_separator /> + <menu_item_check + label="Debug GL" + name="Debug GL"> + <menu_item_check.on_check + function="CheckControl" + parameter="RenderDebugGL" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="RenderDebugGL" /> + </menu_item_check> + <menu_item_check + label="Debug Pipeline" + name="Debug Pipeline"> + <menu_item_check.on_check + function="CheckControl" + parameter="RenderDebugGL" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="RenderDebugGL" /> + </menu_item_check> + <menu_item_check + label="Fast Alpha" + name="Fast Alpha"> + <menu_item_check.on_check + function="CheckControl" + parameter="RenderDebugGL" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="RenderDebugGL" /> + </menu_item_check> + <menu_item_check + label="Animation Textures" + name="Animation Textures"> + <menu_item_check.on_check + function="CheckControl" + parameter="RenderDebugGL" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="RenderDebugGL" /> + </menu_item_check> + <menu_item_check + label="Disable Textures" + name="Disable Textures"> + <menu_item_check.on_check + function="CheckControl" + parameter="TextureDisable" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="TextureDisable" /> + </menu_item_check> + <menu_item_check + label="Full Res Textures" + layout="topleft" + name="Rull Res Textures"> + <menu_item_check.on_check + function="CheckControl" + parameter="TextureLoadFullRes" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="TextureLoadFullRes" /> + </menu_item_check> + <menu_item_check + label="Audit Textures" + layout="topleft" + name="Audit Textures"> + <menu_item_check.on_check + function="CheckControl" + parameter="AuditTexture" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="AuditTexture" /> + </menu_item_check> + <menu_item_check + label="Texture Atlas" + name="Texture Atlas"> + <menu_item_check.on_check + function="CheckControl" + parameter="EnableTextureAtlas" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="EnableTextureAtlas" /> + </menu_item_check> + <menu_item_check + label="Render Attached Lights" + name="Render Attached Lights"> + <menu_item_check.on_check + function="CheckControl" + parameter="RenderAttachedLights" /> + <menu_item_check.on_click + function="Advanced.HandleAttchedLightParticles" + parameter="RenderAttachedLights" /> + </menu_item_check> + <menu_item_check + label="Render Attached Particles" + name="Render Attached Particles"> + <menu_item_check.on_check + function="CheckControl" + parameter="RenderAttachedParticles" /> + <menu_item_check.on_click + function="Advanced.HandleAttchedLightParticles" + parameter="RenderAttachedParticles" /> + </menu_item_check> + <menu_item_check + label="Hover Glow Objects" + name="Hover Glow Objects"> + <menu_item_check.on_check + function="CheckControl" + parameter="RenderHoverGlowEnable" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="RenderHoverGlowEnable" /> + </menu_item_check> + </menu> + + <menu + create_jump_keys="true" + label="Network" + layout="topleft" + name="Network" + tear_off="true"> + <menu_item_check + label="Pause Agent" + layout="topleft" + name="AgentPause"> + <menu_item_check.on_check + function="CheckControl" + parameter="AgentPause" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="AgentPause" /> + </menu_item_check> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Enable Message Log" + layout="topleft" + name="Enable Message Log"> + <menu_item_call.on_click + function="Advanced.EnableMessageLog" /> + </menu_item_call> + <menu_item_call + label="Disable Message Log" + layout="topleft" + name="Disable Message Log"> + <menu_item_call.on_click + function="Advanced.DisableMessageLog" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_check + label="Velocity Interpolate Objects" + layout="topleft" + name="Velocity Interpolate Objects"> + <menu_item_check.on_check + function="CheckControl" + parameter="VelocityInterpolate" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="VelocityInterpolate" /> + </menu_item_check> + <menu_item_check + label="Ping Interpolate Object Positions" + layout="topleft" + name="Ping Interpolate Object Positions"> + <menu_item_check.on_check + function="CheckControl" + parameter="PingInterpolate" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="PingInterpolate" /> + </menu_item_check> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Drop a Packet" + layout="topleft" + name="Drop a Packet" + shortcut="control|alt|L"> + <menu_item_call.on_click + function="Advanced.DropPacket" /> + </menu_item_call> + </menu> + <menu_item_call + label="Dump Scripted Camera" + layout="topleft" + name="Dump Scripted Camera"> + <menu_item_call.on_click + function="Advanced.DumpScriptedCamera" /> + </menu_item_call> + <menu_item_call + label="Bumps, Pushes & Hits" + layout="topleft" + name="Bumps, Pushes &amp; Hits"> + <menu_item_call.on_click + function="Floater.Show" + parameter="bumps" /> + </menu_item_call> + + <menu + create_jump_keys="true" + label="Recorder" + layout="topleft" + name="Recorder" + tear_off="true"> + <menu_item_call + label="Start Playback" + layout="topleft" + name="Start Playback"> + <menu_item_call.on_click + function="Advanced.AgentPilot" + parameter="start playback" /> + </menu_item_call> + <menu_item_call + label="Stop Playback" + layout="topleft" + name="Stop Playback"> + <menu_item_call.on_click + function="Advanced.AgentPilot" + parameter="stop playback" /> + </menu_item_call> + <menu_item_check + label="Loop Playback" + layout="topleft" + name="Loop Playback"> + <menu_item_check.on_check + function="Advanced.CheckAgentPilotLoop" + parameter="loopPlayback" /> + <menu_item_check.on_click + function="Advanced.ToggleAgentPilotLoop" /> + </menu_item_check> + <menu_item_call + label="Start Record" + layout="topleft" + name="Start Record"> + <menu_item_call.on_click + function="Advanced.AgentPilot" + parameter="start record" /> + </menu_item_call> + <menu_item_call + label="Stop Record" + layout="topleft" + name="Stop Record"> + <menu_item_call.on_click + function="Advanced.AgentPilot" + parameter="stop record" /> + </menu_item_call> + </menu> + + <menu + create_jump_keys="true" + label="World" + layout="topleft" + name="World" + tear_off="true"> + <menu_item_check + label="Sim Sun Override" + layout="topleft" + name="Sim Sun Override"> + <menu_item_check.on_check + function="CheckControl" + parameter="SkyOverrideSimSunPosition" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="SkyOverrideSimSunPosition" /> + </menu_item_check> + <menu_item_check + label="Cheesy Beacon" + layout="topleft" + name="Cheesy Beacon"> + <menu_item_check.on_check + function="CheckControl" + parameter="CheesyBeacon" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="CheesyBeacon" /> + </menu_item_check> + <menu_item_check + label="Fixed Weather" + layout="topleft" + name="Fixed Weather"> + <menu_item_check.on_check + function="CheckControl" + parameter="FixedWeather" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="FixedWeather" /> + </menu_item_check> + <menu_item_call + label="Dump Region Object Cache" + layout="topleft" + name="Dump Region Object Cache"> + <menu_item_call.on_click + function="Advanced.DumpRegionObjectCache" /> + </menu_item_call> + </menu> + <menu + create_jump_keys="true" + label="UI" + layout="topleft" + name="UI" + tear_off="true"> + <!-- <menu_item_check + label="New Bottom Bar" + layout="topleft" + name="New Bottom Bar"> + <menu_item_check.on_check + function="CheckControl" + parameter="BottomPanelNew" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="BottomPanelNew" /> + </menu_item_check>--> + <menu_item_call + label="Web Browser Test" + layout="topleft" + name="Web Browser Test"> + <menu_item_call.on_click + function="Advanced.WebBrowserTest" + parameter="http://secondlife.com/app/search/slurls.html"/> + </menu_item_call> + <menu_item_call + label="Dump SelectMgr" + layout="topleft" + name="Dump SelectMgr"> + <menu_item_call.on_click + function="Advanced.DumpSelectMgr" /> + </menu_item_call> + <menu_item_call + label="Dump Inventory" + layout="topleft" + name="Dump Inventory"> + <menu_item_call.on_click + function="Advanced.DumpInventory" /> + </menu_item_call> + <menu_item_call + label="Dump Timers" + name="Dump Timers"> + <menu_item_call.on_click + function="Advanced.DumpTimers" /> + </menu_item_call> + <menu_item_call + label="Dump Focus Holder" + layout="topleft" + name="Dump Focus Holder" + shortcut="control|alt|F"> + <menu_item_call.on_click + function="Advanced.DumpFocusHolder" /> + </menu_item_call> + <menu_item_call + label="Print Selected Object Info" + layout="topleft" + name="Print Selected Object Info" + shortcut="control|shift|P"> + <menu_item_call.on_click + function="Advanced.PrintSelectedObjectInfo" /> + </menu_item_call> + <menu_item_call + label="Print Agent Info" + layout="topleft" + name="Print Agent Info" + shortcut="shift|P"> + <menu_item_call.on_click + function="Advanced.PrintAgentInfo" /> + </menu_item_call> + <menu_item_call + label="Memory Stats" + layout="topleft" + name="Memory Stats" + shortcut="control|alt|shift|M"> + <menu_item_call.on_click + function="Advanced.PrintTextureMemoryStats" /> + </menu_item_call> + <menu_item_check + label="Double-ClickAuto-Pilot" + layout="topleft" + name="Double-ClickAuto-Pilot"> + <menu_item_check.on_check + function="CheckControl" + parameter="DoubleClickAutoPilot" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="DoubleClickAutoPilot" /> + </menu_item_check> + + <menu_item_separator /> + <menu_item_check + label="Debug SelectMgr" + layout="topleft" + name="Debug SelectMgr"> + <menu_item_check.on_check + function="CheckControl" + parameter="DebugSelectMgr" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="DebugSelectMgr" /> + </menu_item_check> + <menu_item_check + label="Debug Clicks" + layout="topleft" + name="Debug Clicks"> + <menu_item_check.on_check + function="Advanced.CheckDebugClicks" + parameter="DebugClicks" /> + <menu_item_check.on_click + function="Advanced.ToggleDebugClicks" + parameter="DebugClicks" /> + </menu_item_check> + <menu_item_check + label="Debug Views" + layout="topleft" + name="Debug Views"> + <menu_item_check.on_check + function="Advanced.CheckDebugViews" /> + <menu_item_check.on_click + function="Advanced.ToggleDebugViews" /> + </menu_item_check> + <menu_item_check + label="Debug Name Tooltips" + layout="topleft" + name="Debug Name Tooltips"> + <menu_item_check.on_check + function="Advanced.CheckXUINameTooltips" + parameter="XUINameTooltips" /> + <menu_item_check.on_click + function="Advanced.ToggleXUINameTooltips" /> + </menu_item_check> + <menu_item_check + label="Debug Mouse Events" + layout="topleft" + name="Debug Mouse Events"> + <menu_item_check.on_check + function="Advanced.CheckDebugMouseEvents" + parameter="MouseEvents" /> + <menu_item_check.on_click + function="Advanced.ToggleDebugMouseEvents" /> + </menu_item_check> + <menu_item_check + label="Debug Keys" + layout="topleft" + name="Debug Keys"> + <menu_item_check.on_check + function="Advanced.CheckDebugKeys" + parameter="DebugKeys" /> + <menu_item_check.on_click + function="Advanced.ToggleDebugKeys" /> + </menu_item_check> + <menu_item_check + label="Debug WindowProc" + layout="topleft" + name="Debug WindowProc"> + <menu_item_check.on_check + function="Advanced.CheckDebugWindowProc" + parameter="DebugWindowProc" /> + <menu_item_check.on_click + function="Advanced.ToggleDebugWindowProc" + parameter="DebugWindowProc" /> + </menu_item_check> + </menu> + <menu + create_jump_keys="true" + label="XUI" + name="XUI" + tear_off="true"> + <menu_item_call + label="Reload Color Settings" + layout="topleft" + name="Reload Color Settings"> + <menu_item_call.on_click + function="Advanced.ReloadColorSettings" /> + </menu_item_call> + <menu_item_call + label="Show Font Test" + layout="topleft" + name="Show Font Test"> + <menu_item_call.on_click + function="Floater.Show" + parameter="font_test" /> + </menu_item_call> + <menu_item_call + label="Load from XML" + layout="topleft" + name="Load from XML"> + <menu_item_call.on_click + function="Advanced.LoadUIFromXML" /> + </menu_item_call> + <menu_item_call + label="Save to XML" + layout="topleft" + name="Save to XML"> + <menu_item_call.on_click + function="Advanced.SaveUIToXML" /> + </menu_item_call> + <menu_item_check + label="Show XUI Names" + layout="topleft" + name="Show XUI Names"> + <menu_item_check.on_check + function="Advanced.CheckXUINames" + parameter="showUIname" /> + <menu_item_check.on_click + function="Advanced.ToggleXUINames" /> + </menu_item_check> + <menu_item_call + label="Send Test IMs" + layout="topleft" + name="Send Test IMs"> + <menu_item_call.on_click + function="Advanced.SendTestIMs" /> + </menu_item_call> + <menu_item_call + label="Test Inspectors" + name="Test Inspectors" + shortcut="control|shift|I"> + <menu_item_call.on_click + function="Floater.Show" + parameter="test_inspectors" /> + </menu_item_call> + </menu> + <menu + create_jump_keys="true" + label="Avatar" + layout="topleft" + name="Character" + tear_off="true"> + <menu + create_jump_keys="true" + label="Grab Baked Texture" + layout="topleft" + name="Grab Baked Texture" + tear_off="true"> + <menu_item_call + label="Iris" + layout="topleft" + name="Iris"> + <menu_item_call.on_click + function="Advanced.GrabBakedTexture" + parameter="iris" /> + <menu_item_call.on_enable + function="Advanced.EnableGrabBakedTexture" + parameter="iris" /> + </menu_item_call> + <menu_item_call + label="Head" + layout="topleft" + name="Head"> + <menu_item_call.on_click + function="Advanced.GrabBakedTexture" + parameter="head" /> + <menu_item_call.on_enable + function="Advanced.EnableGrabBakedTexture" + parameter="head" /> + </menu_item_call> + <menu_item_call + label="Upper Body" + layout="topleft" + name="Upper Body"> + <menu_item_call.on_click + function="Advanced.GrabBakedTexture" + parameter="upper" /> + <menu_item_call.on_enable + function="Advanced.EnableGrabBakedTexture" + parameter="upper" /> + </menu_item_call> + <menu_item_call + label="Lower Body" + layout="topleft" + name="Lower Body"> + <menu_item_call.on_click + function="Advanced.GrabBakedTexture" + parameter="lower" /> + <menu_item_call.on_enable + function="Advanced.EnableGrabBakedTexture" + parameter="lower" /> + </menu_item_call> + <menu_item_call + label="Skirt" + layout="topleft" + name="Skirt"> + <menu_item_call.on_click + function="Advanced.GrabBakedTexture" + parameter="skirt" /> + <menu_item_call.on_enable + function="Advanced.EnableGrabBakedTexture" + parameter="skirt" /> + </menu_item_call> + </menu> + <menu + create_jump_keys="true" + label="Character Tests" + layout="topleft" + name="Character Tests" + tear_off="true"> + <menu_item_call + label="Appearance To XML" + layout="topleft" + name="Appearance To XML"> + <menu_item_call.on_click + function="Advanced.AppearanceToXML" /> + </menu_item_call> + <menu_item_call + label="Toggle Character Geometry" + layout="topleft" + name="Toggle Character Geometry"> + <menu_item_call.on_click + function="Advanced.ToggleCharacterGeometry" /> + <menu_item_call.on_enable + function="IsGodCustomerService" /> + </menu_item_call> + <menu_item_call + label="Test Male" + layout="topleft" + name="Test Male"> + <menu_item_call.on_click + function="Advanced.TestMale" /> + </menu_item_call> + <menu_item_call + label="Test Female" + layout="topleft" + name="Test Female"> + <menu_item_call.on_click + function="Advanced.TestFemale" /> + </menu_item_call> + <menu_item_call + label="Toggle PG" + layout="topleft" + name="Toggle PG"> + <menu_item_call.on_click + function="Advanced.TogglePG" /> + </menu_item_call> + <menu_item_check + label="Allow Select Avatar" + layout="topleft" + name="Allow Select Avatar"> + <menu_item_check.on_check + function="CheckControl" + parameter="AllowSelectAvatar" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="AllowSelectAvatar" /> + </menu_item_check> + </menu> + <menu_item_call + label="Force Params to Default" + layout="topleft" + name="Force Params to Default"> + <menu_item_call.on_click + function="Advanced.ForceParamsToDefault" /> + </menu_item_call> + <menu_item_check + label="Animation Info" + layout="topleft" + name="Animation Info"> + <menu_item_check.on_check + function="Advanced.CheckAnimationInfo" + parameter="AnimationInfo" /> + <menu_item_check.on_click + function="Advanced.ToggleAnimationInfo" + parameter="" /> + </menu_item_check> + <menu_item_check + label="Slow Motion Animations" + layout="topleft" + name="Slow Motion Animations"> + <menu_item_check.on_check + function="CheckControl" + parameter="SlowMotionAnimation" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="SlowMotionAnimation" /> + </menu_item_check> + <menu_item_check + label="Show Look At" + layout="topleft" + name="Show Look At"> + <menu_item_check.on_check + function="Advanced.CheckShowLookAt" + parameter="ShowLookAt" /> + <menu_item_check.on_click + function="Advanced.ToggleShowLookAt" /> + </menu_item_check> + <menu_item_check + label="Show Point At" + layout="topleft" + name="Show Point At"> + <menu_item_check.on_check + function="Advanced.CheckShowPointAt" + parameter="ShowPointAt" /> + <menu_item_check.on_click + function="Advanced.ToggleShowPointAt" /> + </menu_item_check> + <menu_item_check + label="Debug Joint Updates" + layout="topleft" + name="Debug Joint Updates"> + <menu_item_check.on_check + function="Advanced.CheckDebugJointUpdates" + parameter="DebugJointUpdates" /> + <menu_item_check.on_click + function="Advanced.ToggleDebugJointUpdates" /> + </menu_item_check> + <menu_item_check + label="Disable LOD" + layout="topleft" + name="Disable LOD"> + <menu_item_check.on_check + function="Advanced.CheckDisableLOD" + parameter="DisableLOD" /> + <menu_item_check.on_click + function="Advanced.ToggleDisableLOD" /> + </menu_item_check> + <menu_item_check + label="Debug Character Vis" + layout="topleft" + name="Debug Character Vis"> + <menu_item_check.on_check + function="Advanced.CheckDebugCharacterVis" + parameter="DebugCharacterVis" /> + <menu_item_check.on_click + function="Advanced.ToggleDebugCharacterVis" /> + </menu_item_check> + <menu_item_check + label="Show Collision Skeleton" + layout="topleft" + name="Show Collision Skeleton"> + <menu_item_check.on_check + function="Advanced.CheckInfoDisplay" + parameter="collision skeleton" /> + <menu_item_check.on_click + function="Advanced.ToggleInfoDisplay" + parameter="collision skeleton" /> + </menu_item_check> + <menu_item_check + label="Display Agent Target" + layout="topleft" + name="Display Agent Target"> + <menu_item_check.on_check + function="Advanced.CheckInfoDisplay" + parameter="agent target" /> + <menu_item_check.on_click + function="Advanced.ToggleInfoDisplay" + parameter="agent target" /> + </menu_item_check> +<!-- Appears not to exist anymore + <menu_item_check + label="Debug Rotation" + layout="topleft" + name="Debug Rotation"> + <menu_item_check.on_check + function="CheckControl" + parameter="DebugAvatarRotation" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="DebugAvatarRotation" /> + </menu_item_check> --> +--> + <menu_item_call + label="Dump Attachments" + layout="topleft" + name="Dump Attachments"> + <menu_item_call.on_click + function="Advanced.DumpAttachments" /> + </menu_item_call> + <menu_item_call + label="Debug Avatar Textures" + layout="topleft" + name="Debug Avatar Textures" + shortcut="control|alt|shift|A"> + <menu_item_call.on_click + function="Advanced.DebugAvatarTextures" /> + </menu_item_call> + <menu_item_call + label="Dump Local Textures" + layout="topleft" + name="Dump Local Textures" + shortcut="alt|shift|M"> + <menu_item_call.on_click + function="Advanced.DumpAvatarLocalTextures" /> + </menu_item_call> + </menu> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Compress Images" + layout="topleft" + name="Compress Images"> + <menu_item_call.on_click + function="Advanced.CompressImage" /> + </menu_item_call> + <menu_item_check + label="Output Debug Minidump" + layout="topleft" + name="Output Debug Minidump"> + <menu_item_check.on_check + function="CheckControl" + parameter="SaveMinidump" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="SaveMinidump" /> + </menu_item_check> + <menu_item_check + label="Console Window on next Run" + layout="topleft" + name="Console Window"> + <menu_item_check.on_check + function="CheckControl" + parameter="ShowConsoleWindow" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="ShowConsoleWindow" /> + </menu_item_check> + <menu_item_separator + layout="topleft" /> + <menu_item_check + label="Show Admin Menu" + layout="topleft" + name="View Admin Options"> + <menu_item_check.on_check + function="Advanced.CheckViewAdminOptions" + parameter="ViewAdminOptions" /> + <menu_item_check.on_click + function="Advanced.ToggleViewAdminOptions" /> + </menu_item_check> + <menu_item_call + label="Request Admin Status" + layout="topleft" + name="Request Admin Options" + shortcut="control|alt|G"> + <menu_item_call.on_click + function="Advanced.RequestAdminStatus" /> + </menu_item_call> + <menu_item_call + label="Leave Admin Status" + layout="topleft" + name="Leave Admin Options" + shortcut="control|alt|shift|G"> + <menu_item_call.on_click + function="Advanced.LeaveAdminStatus" /> + </menu_item_call> + </menu> + <menu + create_jump_keys="true" + label="Admin" + layout="topleft" + name="Admin" + tear_off="true" + visible="false"> + <menu + create_jump_keys="true" + label="Object" + layout="topleft" + tear_off="true"> + <menu_item_call + label="Take Copy" + layout="topleft" + name="Take Copy" + shortcut="control|alt|shift|O"> + <menu_item_call.on_click + function="Admin.ForceTakeCopy" /> + <menu_item_call.on_enable + function="IsGodCustomerService" /> + </menu_item_call> + <menu_item_call + label="Force Owner To Me" + layout="topleft" + name="Force Owner To Me"> + <menu_item_call.on_click + function="Admin.HandleObjectOwnerSelf" /> + <menu_item_call.on_enable + function="IsGodCustomerService" /> + </menu_item_call> + <menu_item_call + label="Force Owner Permissive" + layout="topleft" + name="Force Owner Permissive"> + <menu_item_call.on_click + function="Admin.HandleObjectOwnerPermissive" /> + <menu_item_call.on_enable + function="IsGodCustomerService" /> + </menu_item_call> + <menu_item_call + label="Delete" + layout="topleft" + name="Delete" + shortcut="control|alt|shift|Del"> + <menu_item_call.on_click + function="Admin.HandleForceDelete" /> + <menu_item_call.on_enable + function="IsGodCustomerService" /> + </menu_item_call> + <menu_item_call + label="Lock" + layout="topleft" + name="Lock" + shortcut="control|alt|shift|L"> + <menu_item_call.on_click + function="Admin.HandleObjectLock" /> + <menu_item_call.on_enable + function="IsGodCustomerService" /> + </menu_item_call> + <menu_item_call + label="Get Assets IDs" + layout="topleft" + name="Get Assets IDs" + shortcut="control|alt|shift|I"> + <menu_item_call.on_click + function="Admin.HandleObjectAssetIDs" /> + <menu_item_call.on_enable + function="IsGodCustomerService" /> + </menu_item_call> + </menu> + <menu + create_jump_keys="true" + label="Parcel" + layout="topleft" + name="Parcel" + tear_off="true"> + <menu_item_call + label="Owner To Me" + layout="topleft" + name="Owner To Me"> + <menu_item_call.on_click + function="Admin.HandleForceParcelOwnerToMe" /> + <menu_item_call.on_enable + function="IsGodCustomerService" /> + </menu_item_call> + <menu_item_call + label="Set to Linden Content" + layout="topleft" + name="Set to Linden Content" + shortcut="control|alt|shift|C"> + <menu_item_call.on_click + function="Admin.HandleForceParcelToContent" /> + <menu_item_call.on_enable + function="IsGodCustomerService" /> + </menu_item_call> + <menu_item_call + label="Claim Public Land" + layout="topleft" + name="Claim Public Land"> + <menu_item_call.on_click + function="Admin.HandleClaimPublicLand" /> + <menu_item_call.on_enable + function="IsGodCustomerService" /> + </menu_item_call> + </menu> + <menu + create_jump_keys="true" + label="Region" + layout="topleft" + name="Region" + tear_off="true"> + <menu_item_call + label="Dump Temp Asset Data" + layout="topleft" + name="Dump Temp Asset Data"> + <menu_item_call.on_click + function="Admin.HandleRegionDumpTempAssetData" /> + <menu_item_call.on_enable + function="IsGodCustomerService" /> + </menu_item_call> + <menu_item_call + label="Save Region State" + layout="topleft" + name="Save Region State"> + <menu_item_call.on_click + function="Admin.OnSaveState" /> + <menu_item_call.on_enable + function="IsGodCustomerService" /> + </menu_item_call> + </menu> + <menu_item_call + label="God Tools" + layout="topleft" + name="God Tools"> + <menu_item_call.on_click + function="Floater.Show" + parameter="god_tools" /> + <menu_item_call.on_enable + function="IsGodCustomerService" /> + </menu_item_call> + </menu> + <menu + create_jump_keys="true" + label="Admin" + layout="topleft" + name="Deprecated" + tear_off="true" + visible="false"> + <menu + create_jump_keys="true" + label="Attach Object" + layout="topleft" + mouse_opaque="false" + name="Attach Object" + tear_off="true" /> + <menu + create_jump_keys="true" + label="Detach Object" + layout="topleft" + mouse_opaque="false" + name="Detach Object" + tear_off="true" /> + <menu + create_jump_keys="true" + label="Take Off Clothing" + layout="topleft" + mouse_opaque="false" + name="Take Off Clothing" + tear_off="true"> + <menu_item_call + label="Shirt" + layout="topleft" + name="Shirt"> + <menu_item_call.on_click + function="Edit.TakeOff" + parameter="shirt" /> + <menu_item_call.on_enable + function="Edit.EnableTakeOff" + parameter="shirt" /> + </menu_item_call> + <menu_item_call + label="Pants" + layout="topleft" + name="Pants"> + <menu_item_call.on_click + function="Edit.TakeOff" + parameter="pants" /> + <menu_item_call.on_enable + function="Edit.EnableTakeOff" + parameter="pants" /> + </menu_item_call> + <menu_item_call + label="Shoes" + layout="topleft" + name="Shoes"> + <menu_item_call.on_click + function="Edit.TakeOff" + parameter="shoes" /> + <menu_item_call.on_enable + function="Edit.EnableTakeOff" + parameter="shoes" /> + </menu_item_call> + <menu_item_call + label="Socks" + layout="topleft" + name="Socks"> + <menu_item_call.on_click + function="Edit.TakeOff" + parameter="socks" /> + <menu_item_call.on_enable + function="Edit.EnableTakeOff" + parameter="socks" /> + </menu_item_call> + <menu_item_call + label="Jacket" + layout="topleft" + name="Jacket"> + <menu_item_call.on_click + function="Edit.TakeOff" + parameter="jacket" /> + <menu_item_call.on_enable + function="Edit.EnableTakeOff" + parameter="jacket" /> + </menu_item_call> + <menu_item_call + label="Gloves" + layout="topleft" + name="Gloves"> + <menu_item_call.on_click + function="Edit.TakeOff" + parameter="gloves" /> + <menu_item_call.on_enable + function="Edit.EnableTakeOff" + parameter="gloves" /> + </menu_item_call> + <menu_item_call + label="Undershirt" + layout="topleft" + name="Menu Undershirt"> + <menu_item_call.on_click + function="Edit.TakeOff" + parameter="undershirt" /> + <menu_item_call.on_enable + function="Edit.EnableTakeOff" + parameter="undershirt" /> + </menu_item_call> + <menu_item_call + label="Underpants" + layout="topleft" + name="Menu Underpants"> + <menu_item_call.on_click + function="Edit.TakeOff" + parameter="underpants" /> + <menu_item_call.on_enable + function="Edit.EnableTakeOff" + parameter="underpants" /> + </menu_item_call> + <menu_item_call + label="Skirt" + layout="topleft" + name="Skirt"> + <menu_item_call.on_click + function="Edit.TakeOff" + parameter="skirt" /> + <menu_item_call.on_enable + function="Edit.EnableTakeOff" + parameter="skirt" /> + </menu_item_call> + <menu_item_call + label="Alpha" + layout="topleft" + name="Alpha"> + <menu_item_call.on_click + function="Edit.TakeOff" + parameter="alpha" /> + <menu_item_call.on_enable + function="Edit.EnableTakeOff" + parameter="alpha" /> + </menu_item_call> + <menu_item_call + label="Tattoo" + layout="topleft" + name="Tattoo"> + <menu_item_call.on_click + function="Edit.TakeOff" + parameter="tattoo" /> + <menu_item_call.on_enable + function="Edit.EnableTakeOff" + parameter="tattoo" /> + </menu_item_call> + <menu_item_call + label="All Clothes" + layout="topleft" + name="All Clothes"> + <menu_item_call.on_click + function="Edit.TakeOff" + parameter="all" /> + </menu_item_call> + </menu> + <menu_item_check + label="Show Toolbar" + layout="topleft" + name="Show Toolbar"> + <menu_item_check.on_check + function="FloaterVisible" + parameter="toolbar" /> + <menu_item_check.on_click + function="ShowFloater" + parameter="toolbar" /> + </menu_item_check> + <menu + create_jump_keys="true" + label="Help" + layout="topleft" + name="Help" + tear_off="true"> + <menu_item_call + label="Official Linden Blog" + layout="topleft" + name="Official Linden Blog"> + <menu_item_call.on_click + function="PromptShowURL" + name="OfficialLindenBlog_url" + parameter="WebLaunchSupportWiki,http://blog.secondlife.com/" /> + </menu_item_call> + <menu_item_call + label="Scripting Portal" + layout="topleft" + name="Scripting Portal"> + <menu_item_call.on_click + function="PromptShowURL" + name="ScriptingPortal_url" + parameter="WebLaunchLSLWiki,http://wiki.secondlife.com/wiki/LSL_Portal" /> + </menu_item_call> + <menu + create_jump_keys="true" + label="Bug Reporting" + layout="topleft" + name="Bug Reporting" + tear_off="true"> + <menu_item_call + label="Public Issue Tracker" + layout="topleft" + name="Public Issue Tracker"> + <menu_item_call.on_click + function="PromptShowURL" + name="PublicIssueTracker_url" + parameter="WebLaunchPublicIssue,http://jira.secondlife.com" /> + </menu_item_call> + <menu_item_call + label="Public Issue Tracker Help" + layout="topleft" + name="Publc Issue Tracker Help"> + <menu_item_call.on_click + function="PromptShowURL" + name="PublicIssueTrackerHelp_url" + parameter="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Bug Reporting 101" + layout="topleft" + name="Bug Reporing 101"> + <menu_item_call.on_click + function="PromptShowURL" + name="BugReporting101_url" + parameter="WebLaunchBugReport101,http://wiki.secondlife.com/wiki/Bug_Reporting_101" /> + </menu_item_call> + <menu_item_call + label="Security Issues" + layout="topleft" + name="Security Issues"> + <menu_item_call.on_click + function="PromptShowURL" + name="SecurityIssues_url" + parameter="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues" /> + </menu_item_call> + <menu_item_call + label="QA Wiki" + layout="topleft" + name="QA Wiki"> + <menu_item_call.on_click + function="PromptShowURL" + name="QAWiki_url" + parameter="WebLaunchQAWiki,http://wiki.secondlife.com/wiki/QA_Portal" /> + </menu_item_call> + </menu> + </menu> + </menu> +</menu_bar> diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index df263ddf3d..49276172d5 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -581,9 +581,10 @@ Multiple faces are currently selected. If you continue this action, separate instances of media will be set on multiple faces of the object. To place the media on only one face, choose Select Texture and click on the desired face of that object then click Add. <usetemplate - name="okcancelignore" - notext="Cancel" - yestext="OK"/> + ignoretext="Media will be set on multiple selected faces" + name="okcancelignore" + notext="Cancel" + yestext="OK"/> </notification> <notification @@ -721,7 +722,7 @@ You need an account to enter [SECOND_LIFE]. Would you like to create one now? icon="alertmodal.tga" name="AddClassified" type="alertmodal"> -Classified ads appear in the 'Classified' section of the Search directory and on [http://www.secondlife.com secondlife.com] for one week. +Classified ads appear in the 'Classified' section of the Search directory and on [http://secondlife.com/community/classifieds secondlife.com] for one week. Fill out your ad, then click 'Publish...' to add it to the directory. You'll be asked for a price to pay when clicking Publish. Paying more makes your ad appear higher in the list, and also appear higher when people search for keywords. @@ -1171,6 +1172,13 @@ Eject [AVATAR_NAME] from your land? <notification icon="alertmodal.tga" + name="EjectAvatarFromGroup" + type="notify"> +You ejected [AVATAR_NAME] from group [GROUP_NAME] + </notification> + + <notification + icon="alertmodal.tga" name="AcquireErrorTooManyObjects" type="alertmodal"> ACQUIRE ERROR: Too many objects selected. @@ -1435,6 +1443,13 @@ Select objects with scripts that you have permission to modify. <notification icon="alertmodal.tga" + name="CannotOpenScriptObjectNoMod" + type="alertmodal"> + Unable to open script in object without modify permissions. + </notification> + + <notification + icon="alertmodal.tga" name="CannotSetRunningSelectObjectsNoScripts" type="alertmodal"> Not able to set any scripts to 'running'. @@ -2367,15 +2382,15 @@ Please choose the male or female avatar. You can change your mind later. <notification icon="alertmodal.tga" name="GrantedModifyRights" - type="alertmodal"> -[FIRST_NAME] [LAST_NAME] has given you permission to edit their objects. + type="notify"> +[NAME] has given you permission to edit their objects. </notification> <notification icon="alertmodal.tga" name="RevokedModifyRights" - type="alertmodal"> -Your privilege to modify [FIRST_NAME] [LAST_NAME]'s objects has been revoked + type="notify"> +Your privilege to modify [NAME]'s objects has been revoked </notification> <notification @@ -3260,7 +3275,7 @@ You are not allowed in that region due to your maturity Rating. Go to the Knowledge Base for more information about maturity Ratings? <url option="0" name="url"> - https://support.secondlife.com/ics/support/default.asp?deptID=4417&task=knowledge&questionID=6010 + http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview </url> <usetemplate name="okcancelignore" @@ -3317,7 +3332,7 @@ You cannot claim this land due to your maturity Rating. Go to the Knowledge Base for more information about maturity Ratings? <url option="0" name="url"> - https://support.secondlife.com/ics/support/default.asp?deptID=4417&task=knowledge&questionID=6010 + http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview </url> <usetemplate name="okcancelignore" @@ -3367,7 +3382,7 @@ You cannot buy this land due to your maturity Rating. Go to the Knowledge Base for more information about maturity Ratings? <url option="0" name="url"> - https://support.secondlife.com/ics/support/default.asp?deptID=4417&task=knowledge&questionID=6010 + http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview </url> <usetemplate name="okcancelignore" @@ -3764,7 +3779,7 @@ There are no items in this object that you are allowed to copy. icon="alertmodal.tga" name="WebLaunchAccountHistory" type="alertmodal"> -Go to your [http://secondlife.com/account/ Dashboard] to see your account history? +Go to your [http://secondlife.com/account/ Dashboard] to see your account history? <usetemplate ignoretext="Launch my browser to see my account history" name="okcancelignore" @@ -3931,6 +3946,18 @@ Would you like to leave Busy Mode before completing this transaction? <notification icon="alertmodal.tga" + name="ConfirmDeleteProtectedCategory" + type="alertmodal"> +The folder '[FOLDERNAME]' is a system folder. Deleting system folders can cause instability. Are you sure you want to delete it? + <usetemplate + ignoretext="Confirm before I delete a system folder" + name="okcancelignore" + notext="Cancel" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" name="ConfirmEmptyTrash" type="alertmodal"> Are you sure you want to permanently delete the contents of your Trash? @@ -4486,7 +4513,7 @@ You don't have permission to copy this. icon="notifytip.tga" name="InventoryAccepted" type="notifytip"> -[NAME] accepted your inventory offer. +[NAME] received your inventory offer. </notification> <notification @@ -4957,17 +4984,18 @@ No valid parcel could be found. <notification icon="notify.tga" name="ObjectGiveItem" - type="notify"> -An object named [OBJECTFROMNAME] owned by [FIRST] [LAST] has given you a [OBJECTTYPE] named [OBJECTNAME]. + type="offer"> +An object named [OBJECTFROMNAME] owned by [NAME_SLURL] has given you [OBJECTTYPE]: +[ITEM_SLURL] <form name="form"> <button index="0" name="Keep" - text="OK"/> + text="Keep"/> <button index="1" name="Discard" - text="Cancel"/> + text="Discard"/> <button index="2" name="Mute" @@ -4978,17 +5006,18 @@ An object named [OBJECTFROMNAME] owned by [FIRST] [LAST] has given you a [OBJECT <notification icon="notify.tga" name="ObjectGiveItemUnknownUser" - type="notify"> -An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you a [OBJECTTYPE] named [OBJECTNAME]. + type="offer"> +An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you [OBJECTTYPE]: +[ITEM_SLURL] <form name="form"> <button index="0" name="Keep" - text="OK"/> + text="Keep"/> <button index="1" name="Discard" - text="Cancel"/> + text="Discard"/> <button index="2" name="Mute" @@ -5000,16 +5029,21 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you a icon="notify.tga" name="UserGiveItem" type="offer"> -[NAME] has given you a [OBJECTTYPE] named '[OBJECTNAME]'. +[NAME_SLURL] has given you [OBJECTTYPE]: +[ITEM_SLURL] <form name="form"> <button index="0" name="Keep" - text="Accept"/> + text="Keep"/> + <button + index="4" + name="Show" + text="Show"/> <button index="1" name="Discard" - text="No, thanks"/> + text="Discard"/> </form> </notification> @@ -5296,6 +5330,27 @@ Grant this request? <notification icon="notify.tga" + name="ScriptToast" + type="notify"> + [FIRST] [LAST]'s '[TITLE]' is requesting user input. + <form name="form"> + <button + index="0" + name="Open" + text="Open Dialog"/> + <button + index="1" + name="Ignore" + text="Ignore"/> + <button + index="2" + name="Block" + text="Block"/> + </form> + </notification> + + <notification + icon="notify.tga" name="FirstBalanceIncrease" type="notify"> You just received L$[AMOUNT]. @@ -5739,6 +5794,15 @@ Are you sure you want to delete your teleport history? yestext="OK"/> </notification> + <notification + icon="alert.tga" + name="BottomTrayButtonCanNotBeShown" + type="alert"> +Selected button can not be shown right now. +The button will be shown when there is enough space for it. + </notification> + + <global name="UnsupportedCPU"> - Your CPU speed does not meet the minimum requirements. </global> @@ -5765,13 +5829,6 @@ If you continue to have problems, please visit the [SUPPORT_SITE]. - Your system memory does not meet the minimum requirements. </global> - <global name="PermYes"> -Yes - </global> - - <global name="PermNo"> -No - </global> <!-- this is alert string from server. the name needs to match entire the server string, and needs to be changed whenever the server string changes --> <global name="You can only set your 'Home Location' on your land or at a mainland Infohub."> diff --git a/indra/newview/skins/default/xui/en/panel_activeim_row.xml b/indra/newview/skins/default/xui/en/panel_activeim_row.xml index 5562ec8406..3ed91cb48f 100644 --- a/indra/newview/skins/default/xui/en/panel_activeim_row.xml +++ b/indra/newview/skins/default/xui/en/panel_activeim_row.xml @@ -7,7 +7,9 @@ left="0" height="35" width="318" - background_visible="false"> + background_opaque="false" + background_visible="true" + bg_alpha_color="0.0 0.0 0.0 0.0" > <chiclet_im_p2p name="p2p_chiclet" layout="topleft" 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 0246e21d25..f5fce65c73 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 @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel border="false" + follows="all" height="215" name="panel_im_control_panel" width="180"> - <avatar_list color="DkGray2" - follows="left|top|right|bottom" + follows="all" height="130" ignore_online_status="true" layout="topleft" @@ -18,46 +18,42 @@ show_profile_btn="false" show_speaking_indicator="false" top="10" - width="180"/> - + width="180" /> <panel background_visible="true" - bg_alpha_color="0.2 0.2 0.2 1" + bg_alpha_color="DkGray2" border="false" bottom="1" - follows="left|bottom" + follows="left|right|bottom" height="70" left="0" left_pad="0" name="panel_call_buttons" top_pad="0" width="180"> - <button bottom="10" + follows="all" height="20" label="Call" - left_delta="28" + left_delta="40" name="call_btn" - width="125"/> - + width="100" /> <button bottom="40" + follows="all" height="20" label="Leave Call" name="end_call_btn" visible="false" - width="125"/> - + width="100" /> <button - enabled="false" + follows="all" bottom="10" height="20" - label="Open Voice Controls" + label="Voice Controls" name="voice_ctrls_btn" visible="false" - width="125"/> - + width="100" /> </panel> - </panel> diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml index 2eaa3a94ee..45f9d9c7b6 100644 --- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml @@ -7,6 +7,18 @@ name="avatar_list_item" top="0" width="320"> + <!-- + Strings used to localize last interaction time. + See last_interaction textbox below. + --> + <string name="FormatSeconds">[COUNT]s</string> + <string name="FormatMinutes">[COUNT]m</string> + <string name="FormatHours">[COUNT]h</string> + <string name="FormatDays">[COUNT]d</string> + <string name="FormatWeeks">[COUNT]w</string> + <string name="FormatMonths">[COUNT]mon</string> + <string name="FormatYears">[COUNT]y</string> + <icon follows="top|right|left" height="24" diff --git a/indra/newview/skins/default/xui/en/panel_avatar_tag.xml b/indra/newview/skins/default/xui/en/panel_avatar_tag.xml index 16c8660781..b779b08a63 100644 --- a/indra/newview/skins/default/xui/en/panel_avatar_tag.xml +++ b/indra/newview/skins/default/xui/en/panel_avatar_tag.xml @@ -4,66 +4,63 @@ top="10" width="250" height="100" - background_opaque="false" - background_visible="true" - follows="left|top|bottom|right" - bg_alpha_color="0.3 0.3 0.3 1.0"> - <panel - width="250" - height="30" - background_visible="true" - background_opaque="false" + follows="all"> + <panel + width="240" + height="24" + left="5" + background_visible="true" + background_opaque="false" follows="left|top|right" - bg_alpha_color="0.0 0.0 0.0 1.0" + top="-5" + bg_alpha_color="black" name="msg_caption"> - <avatar_icon - top="-7" - left="10" - width="20" - height="20" + <avatar_icon + top="-3" + left="3" + width="18" + image_name="Generic_Person" + height="18" follows="left|top" - color="1 1 1 1" - enabled="true" - name="avatar_tag_icon"/> + enabled="true" + name="avatar_tag_icon" /> <text - width="160" - top="-10" - left="40" - height="20" + width="160" + top="-8" + left="30" + height="20" follows="left|right|top" - font="SansSerifBigBold" - text_color="white" + font.style="BOLD" + text_color="white" word_wrap="true" - mouse_opaque="true" - name="sender_tag_name" > + mouse_opaque="true" + name="sender_tag_name"> Angela Tester </text> - <text - width="30" - top="-12" - left="210" - height="20" - follows="right|top" - text_color="white" - word_wrap="true" - mouse_opaque="true" - name="tag_time" > - 07:52 - </text> + <text + font="SansSerifSmall" + follows="right" + height="13" + layout="topleft" + halign="right" + right="-5" + name="tag_time" + top="8" + value="23:30" + width="50" /> </panel> - <text_editor - top="65" - left="10" - right="-10" - height="100" - follows="left|top|bottom|right" - font="SansSerifSmall" + <text_editor + bg_readonly_color="DkGray" + font="SansSerifSmall" + top="65" + left="5" + right="-5" + height="100" + follows="all" read_only="true" - bg_readonly_color="0 0 0 0" word_wrap="true" - mouse_opaque="true" - name="msg_text" > + mouse_opaque="true" + name="msg_text"> The quick brown fox jumps over the lazy dog. </text_editor> </panel> - diff --git a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml index 5c8a8ee208..3842c2a8db 100644 --- a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml @@ -61,6 +61,7 @@ layout="topleft" left_delta="0" name="Block object by name..." + tool_tip="Pick an object to block by name" top_pad="4" width="210" > <button.commit_callback diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index 3c16a439d9..ec3f7ea7c5 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -46,7 +46,7 @@ left="0" min_height="23" width="310" - top="0" + top="4" min_width="192" name="chat_bar" user_resize="false" @@ -58,21 +58,27 @@ height="28" layout="topleft" min_height="28" - width="104" + width="100" top_delta="0" - min_width="104" + min_width="54" name="speak_panel" user_resize="false"> <talk_button - follows="right" + follows="left|right" height="23" speak_button.tab_stop="true" show_button.tab_stop="true" layout="topleft" left="0" name="talk" - top="3" - width="100" /> + top="4" + width="100"> + <show_button> + <show_button.init_callback + function="Button.SetDockableFloaterToggle" + parameter="voice_controls" /> + </show_button> + </talk_button> </layout_panel> <icon auto_resize="false" @@ -94,7 +100,7 @@ min_height="28" width="82" top_delta="0" - min_width="82" + min_width="52" name="gesture_panel" user_resize="false"> <gesture_combo_box @@ -104,10 +110,13 @@ layout="topleft" name="Gesture" left="0" - top="3" - use_ellipses="true" + top="4" width="82" - tool_tip="Shows/hides gestures"/> + tool_tip="Shows/hides gestures"> + <gesture_combo_box.drop_down_button + pad_right="10" + use_ellipses="true" /> + </gesture_combo_box> </layout_panel> <icon auto_resize="false" @@ -131,8 +140,11 @@ name="movement_panel" user_resize="false" width="80" - min_width="80"> + min_width="49"> <button + image_selected="PushButton_Selected_Press" + image_pressed="PushButton_Press" + image_pressed_selected="PushButton_Selected_Press" follows="left|right" height="23" use_ellipses="true" @@ -141,7 +153,7 @@ layout="topleft" name="movement_btn" tool_tip="Shows/hides movement controls" - top="3" + top="4" width="80"> <button.init_callback function="Button.SetDockableFloaterToggle" @@ -167,11 +179,14 @@ height="28" layout="topleft" min_height="28" - min_width="80" + min_width="49" name="cam_panel" user_resize="false" width="80"> <button + image_selected="PushButton_Selected_Press" + image_pressed="PushButton_Press" + image_pressed_selected="PushButton_Selected_Press" follows="left|right" height="23" use_ellipses="true" @@ -180,7 +195,7 @@ layout="topleft" left="0" tool_tip="Shows/hides camera controls" - top="3" + top="4" name="camera_btn" width="80"> <button.init_callback @@ -217,7 +232,7 @@ layout="topleft" name="snapshots" width="36" - top="3" + top="4" image_overlay="Snapshot_Off" tool_tip="Take snapshot"> <button.commit_callback @@ -241,37 +256,47 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly. <chiclet_panel mouse_opaque="false" follows="left|right" - height="28" + height="23" layout="topleft" left="0" min_width="180" name="chiclet_list" - top="0" - chiclet_padding="3" + top="4" + chiclet_padding="4" scrolling_offset="40" width="189"> <button auto_resize="true" follows="right" height="23" - image_selected="BottomTray_Scroll_Left" - image_unselected="BottomTray_Scroll_Left" + image_selected="SegmentedBtn_Left_Off" + image_unselected="SegmentedBtn_Left_Off" + image_hover_selected="SegmentedBtn_Left_Over" + image_hover_unselected="SegmentedBtn_Left_Over" + image_pressed="SegmentedBtn_Left_Press" + image_pressed_selected="SegmentedBtn_Left_Press" + image_overlay="Arrow_Small_Left" layout="topleft" name="chicklet_left_scroll_button" tab_stop="false" - top="3" + top="0" visible="false" width="20" /> <button auto_resize="true" follows="right" height="23" - image_selected="BottomTray_Scroll_Right" - image_unselected="BottomTray_Scroll_Right" + image_selected="SegmentedBtn_Right_Off" + image_unselected="SegmentedBtn_Right_Off" + image_hover_selected="SegmentedBtn_Right_Over" + image_hover_unselected="SegmentedBtn_Right_Over" + image_pressed="SegmentedBtn_Right_Press" + image_pressed_selected="SegmentedBtn_Right_Press" + image_overlay="Arrow_Small_Right" layout="topleft" name="chicklet_right_scroll_button" tab_stop="false" - top="3" + top="0" visible="false" width="20" /> </chiclet_panel> @@ -295,8 +320,8 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly. min_height="28" top="0" name="sys_well_panel" - width="34" - min_width="34" + width="54" + min_width="54" user_resize="false"> <chiclet_notification follows="right" @@ -305,22 +330,24 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly. left="0" name="sys_well" top="4" - width="34"> + width="54"> <button + image_selected="PushButton_Selected_Press" + image_pressed="PushButton_Press" + image_pressed_selected="PushButton_Selected_Press" auto_resize="true" halign="right" height="23" follows="right" flash_color="EmphasisColor" + left="0" name="Unread" image_overlay="Notices_Unread" - width="20" + image_overlay_alignment="right" + pad_right="6" + pad_left="6" + width="54" /> - <unread_notifications - width="34" - height="20" - left="0" - top="19" /> </chiclet_notification> </layout_panel> <icon @@ -333,6 +360,6 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly. min_width="4" right="-1" top="0" - width="26"/> + width="4"/> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_chat_header.xml b/indra/newview/skins/default/xui/en/panel_chat_header.xml index 64519b2571..c1090a1686 100644 --- a/indra/newview/skins/default/xui/en/panel_chat_header.xml +++ b/indra/newview/skins/default/xui/en/panel_chat_header.xml @@ -1,44 +1,48 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - background_visible="true" - bevel_style="in" - bg_alpha_color="black" - follows="left|top|right" - height="20" - label="im_header" - layout="topleft" - name="im_header" > - <avatar_icon - follows="left" - height="16" - image_name="icon_avatar_online.tga" - layout="topleft" - left="2" - mouse_opaque="true" - name="avatar_icon" - top="2" - width="16" /> - <text + background_visible="true" + bevel_style="in" + bg_alpha_color="black" + follows="top|left|right" + height="24" + label="im_header" + layout="topleft" + name="im_header" + width="300"> + <avatar_icon + follows="left" + height="18" + image_name="Generic_Person" + layout="topleft" + left="3" + mouse_opaque="true" + name="avatar_icon" + top="3" + width="18" /> + <text_editor + v_pad = "0" + read_only = "true" follows="left|right" - font="SansSerifBigBold" - height="20" - layout="topleft" - left_pad="6" - right="-50" + font.style="BOLD" + height="12" + layout="topleft" + left_pad="5" + right="-60" name="user_name" text_color="white" - top="3" - value="Darth Vader" - use_ellipses="true" /> + top="8" + use_ellipses="true" + value="Ericag Vader" /> <text - follows="right" - font="SansSerifBig" - height="20" - layout="topleft" + font="SansSerifSmall" + follows="right" + halign="right" + height="13" + layout="topleft" + left_pad="5" name="time_box" - right="0" - text_color="white" - top="3" - value="23:30" - width="50" /> + right="-5" + top="8" + value="23:30" + width="50" /> </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 05b04bbf8e..34c6e02684 100644 --- a/indra/newview/skins/default/xui/en/panel_chat_item.xml +++ b/indra/newview/skins/default/xui/en/panel_chat_item.xml @@ -1,38 +1,27 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <!-- All our XML is utf-8 encoded. --> - <panel name="instant_message" - width="300" + width="315" height="180" - background_opaque="true" - background_visible="false" - follows="left|top|right|bottom" - bg_alpha_color="0.3 0.3 0.3 0"> - <panel width="250" height="30" background_visible="true" background_opaque="false" bg_alpha_color="0.0 0.0 0.0 1.0" name="msg_caption"> - <avatar_icon - top="25" left="10" width="20" height="20" follows="left|top" - color="1 1 1 1" enabled="true" name="avatar_icon" - /> - <text - width="130" top="25" left="40" height="20" follows="left|right|top" - font="SansSerifBigBold" text_color="white" word_wrap="false" use_ellipses="true" - mouse_opaque="true" name="sender_name" > - Jerry Knight - </text> - <icon top="22" left="170" width="15" height="15" follows="top|right" - image_name="icn_voice-pvtfocus.tga" visible="false" name="msg_inspector"/> - <icon top="22" left="190" width="10" height="10" follows="top|right" - image_name="speaking_indicator.tga" name="msg_icon"/> - <text width="35" top="22" left="205" height="20" follows="right|top" - text_color="white" word_wrap="true" mouse_opaque="true" name="msg_time" > - 10:32 - </text> - </panel> + follows="all"> + <avatar_icon + follows="left|top" + height="18" + image_name="Generic_Person" + layout="topleft" + left="3" + mouse_opaque="true" + name="avatar_icon" + top="3" + width="18" /> <text_chat - top="-35" left="10" right="-10" height="120" follows="left|right|bottom" - font="SansSerifSmall" text_color="white" word_wrap="true" - mouse_opaque="true" name="msg_text" > + top="5" + left="30" + height="120" + text_color="white" + word_wrap="true" + mouse_opaque="true" + name="msg_text"> </text_chat> </panel> - diff --git a/indra/newview/skins/default/xui/en/panel_classified_info.xml b/indra/newview/skins/default/xui/en/panel_classified_info.xml index bdca8531dc..df889e87c3 100644 --- a/indra/newview/skins/default/xui/en/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml @@ -151,7 +151,6 @@ name="buttons"> <button follows="bottom|left" - font="SansSerifSmall" height="19" label="Teleport" layout="topleft" @@ -161,7 +160,6 @@ width="90" /> <button follows="bottom|left" - font="SansSerifSmall" height="19" label="Map" layout="topleft" @@ -171,7 +169,6 @@ width="90" /> <button follows="bottom|left" - font="SansSerifSmall" height="19" label="Edit" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml index ee333be0cb..b881719e3a 100644 --- a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml @@ -12,24 +12,24 @@ follows="all" height="85" image_name="ListItem_Over" - right="-3" + right="-2" mouse_opaque="false" name="hovered_icon" top="1" scale_image="true" visible="false" - width="307"/> + width="308"/> <icon follows="all" height="85" image_name="ListItem_Select" - right="-3" + right="-2" mouse_opaque="false" name="selected_icon" top="1" scale_image="true" visible="false" - width="307"/> + width="308"/> <texture_picker allow_no_texture="true" border_enabled="true" @@ -47,37 +47,34 @@ width="90" /> <text follows="top|left|right" - font="SansSerifSmallBold" - height="16" + font="SansSerifSmall" + height="15" layout="topleft" left="110" name="name" text_color="white" top="9" - use_ellipses="false" - width="197" + use_ellipses="true" + width="193" word_wrap="false" /> <expandable_text follows="top|left|right" font="SansSerifSmall" - height="40" + height="55" layout="topleft" - left="110" + left="103" name="description" - top_pad="3" + top_pad="0" width="178" word_wrap="true" /> <button - follows="top|right" - height="16" - image_selected="BuyArrow_Press" - image_pressed="BuyArrow_Press" - image_unselected="BuyArrow_Press" + follows="right" + height="20" + image_overlay="ForwardArrow_Off" layout="topleft" + left_pad="5" + right="-8" name="info_chevron" - picture_style="true" - right="-7" - tab_stop="false" - top="27" - width="16" /> + top_delta="15" + width="20" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml index 2378ae518b..a833ad97d9 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml @@ -15,6 +15,10 @@ [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION] </string> + <string + name="RegisterDateFormat"> + [REG_DATE] ([AGE]) + </string> <string name="AcctTypeResident" value="Resident" /> diff --git a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml index 763dd7b922..889f29fc53 100644 --- a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml +++ b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel border="false" + follows="left|top|right|bottom" height="238" name="panel_im_control_panel" width="180"> @@ -8,7 +9,7 @@ <avatar_list color="DkGray2" follows="left|top|right|bottom" - height="130" + height="100" ignore_online_status="true" layout="topleft" left="3" @@ -22,6 +23,7 @@ <button bottom_pad="0" + follows="left|right|bottom" height="20" label="Group Info" left_delta="28" @@ -32,8 +34,7 @@ background_visible="true" bg_alpha_color="0.2 0.2 0.2 1" border="false" - bottom="1" - follows="left|bottom" + follows="left|right|bottom" height="70" left="0" left_pad="0" @@ -43,6 +44,7 @@ <button bottom="10" + follows="all" height="20" label="Call Group" left_delta="28" @@ -51,6 +53,7 @@ <button bottom="40" + follows="all" height="20" label="Leave Call" name="end_call_btn" @@ -58,8 +61,8 @@ width="125"/> <button - enabled="false" bottom="10" + follows="all" height="20" label="Open Voice Controls" name="voice_ctrls_btn" diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml index 58a78a0ab8..4c30db4034 100644 --- a/indra/newview/skins/default/xui/en/panel_group_general.xml +++ b/indra/newview/skins/default/xui/en/panel_group_general.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel follows="all" - height="380" + height="378" label="General" class="panel_group_general" layout="topleft" @@ -40,13 +40,13 @@ Hover your mouse over the options for more help. column_padding="0" draw_heading="true" follows="left|top" - heading_height="16" + heading_height="20" height="130" layout="topleft" - left="5" + left="0" name="visible_members" top_pad="2" - width="305"> + width="310"> <name_list.columns label="Member" name="name" @@ -59,9 +59,9 @@ Hover your mouse over the options for more help. <text follows="left|top" type="string" - height="14" + height="12" layout="topleft" - left_delta="0" + left="5" name="active_title_label" top_pad="5" width="300"> @@ -75,7 +75,7 @@ Hover your mouse over the options for more help. name="active_title" tool_tip="Sets the title that appears in your avatar's name tag when this group is active." top_pad="2" - width="305" /> + width="300" /> <check_box height="16" font="SansSerifSmall" @@ -101,12 +101,12 @@ Hover your mouse over the options for more help. border="true" bg_alpha_color="FloaterUnfocusBorderColor" follows="left|top" - height="93" + height="90" layout="topleft" left="5" name="preferences_container" top_pad="5" - width="305"> + width="300"> <check_box follows="right|top" height="16" @@ -140,7 +140,7 @@ Hover your mouse over the options for more help. left_pad="2" name="spin_enrollment_fee" tool_tip="New members must pay this fee to join the group when Enrollment Fee is checked." - width="105" /> + width="100" /> <check_box height="16" initial_value="true" @@ -157,7 +157,7 @@ Hover your mouse over the options for more help. left_delta="0" name="group_mature_check" tool_tip="Sets whether your group information is considered mature" - top_pad="5" + top_pad="2" width="190"> <combo_box.item label="PG Content" diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml index 0082128ca4..c0db734f8c 100644 --- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml @@ -2,10 +2,10 @@ <panel background_visible="true" follows="all" - height="570" + height="635" label="Group Info" layout="topleft" - min_height="425" + min_height="460" left="0" top="20" name="GroupInfo" @@ -116,44 +116,43 @@ background_visible="true" visible="true" width="120" /> <accordion + single_expansion="true" follows="all" - height="405" + height="478" layout="topleft" left="0" name="groups_accordion" - top_pad="15" + top_pad="10" width="323"> <accordion_tab - expanded="true" - layout="topleft" - name="group_general_tab" - title="General"> + expanded="false" + layout="topleft" + name="group_general_tab" + title="General"> <panel - border="false" - class="panel_group_general" + border="false" + class="panel_group_general" filename="panel_group_general.xml" layout="topleft" left="0" help_topic="group_general_tab" name="group_general_tab_panel" - top="0" - width="300" /> + top="0" /> </accordion_tab> <accordion_tab - expanded="false" - layout="topleft" - name="group_roles_tab" - title="Roles"> - <panel - border="false" - class="panel_group_roles" - filename="panel_group_roles.xml" - layout="topleft" - left="0" - help_topic="group_roles_tab" - name="group_roles_tab_panel" - top="0" - width="303" /> + expanded="true" + layout="topleft" + name="group_roles_tab" + title="Roles"> + <panel + border="false" + class="panel_group_roles" + filename="panel_group_roles.xml" + layout="topleft" + left="0" + help_topic="group_roles_tab" + name="group_roles_tab_panel" + top="0" /> </accordion_tab> <accordion_tab expanded="false" @@ -168,8 +167,7 @@ background_visible="true" left="0" help_topic="group_notices_tab" name="group_notices_tab_panel" - top="0" - width="303" /> + top="0" /> </accordion_tab> <accordion_tab expanded="false" @@ -184,21 +182,25 @@ background_visible="true" left="0" help_topic="group_land_money_tab" name="group_land_tab_panel" - top="0" - width="300" /> + top="0" /> </accordion_tab> </accordion> + <panel + name="button_row" + height="23" + follows="bottom|left" + top_pad="-1" + width="323"> <button follows="top|left" height="22" image_overlay="Refresh_Off" layout="topleft" - left="5" + left="10" name="btn_refresh" - top_pad="-15" width="23" /> - <button - height="20" + <button + height="22" label="Create" label_selected="New group" name="btn_create" @@ -214,12 +216,12 @@ background_visible="true" visible="false" width="65" />--> <button - height="20" - font="SansSerifSmall" + height="22" label="Save" label_selected="Save" name="btn_apply" left_pad="10" right="-10" - width="65" /> + width="100" /> + </panel> </panel>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_group_invite.xml b/indra/newview/skins/default/xui/en/panel_group_invite.xml index 1996977acb..37578eae70 100644 --- a/indra/newview/skins/default/xui/en/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/en/panel_group_invite.xml @@ -33,7 +33,6 @@ invite to your group. Click 'Open Resident Chooser' to start. </text> <button - font="SansSerifSmall" height="20" label="Open Resident Chooser" layout="topleft" @@ -53,7 +52,6 @@ Resident Chooser' to start. top_pad="4" width="200" /> <button - font="SansSerifSmall" height="20" label="Remove Selected from List" layout="topleft" @@ -82,7 +80,6 @@ Resident Chooser' to start. top_delta="16" width="196" /> <button - font="SansSerifSmall" height="20" label="Send Invitations" layout="topleft" @@ -91,7 +88,6 @@ Resident Chooser' to start. top="356" width="130" /> <button - font="SansSerifSmall" height="20" label="Cancel" layout="topleft" 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 2c649642c3..2075d7e05b 100644 --- a/indra/newview/skins/default/xui/en/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/en/panel_group_land_money.xml @@ -2,7 +2,7 @@ <panel border="false" follows="all" - height="510" + height="380" label="Land & L$" layout="topleft" left="0" @@ -11,7 +11,7 @@ width="310"> <panel.string name="help_text"> - Parcels owned by a group are listed along with contribution details. A warning appears until the Total Land in Use is less than or = to the Total Contribution. + A warning appears until the Total Land in Use is less than or = to the Total Contribution. </panel.string> <panel.string name="cant_view_group_land_text"> @@ -43,14 +43,14 @@ </text> --> <scroll_list draw_heading="true" - follows="top" + follows="top|left|right" heading_height="20" - height="150" + height="130" layout="topleft" - left="2" + left="0" + top="0" name="group_parcel_list" - top_pad="0" - width="305"> + width="310"> <scroll_list.columns label="Parcel" name="name" @@ -72,34 +72,22 @@ name="hidden" width="-1" /> </scroll_list> - <button - follows="top" - height="23" - label="Map" - label_selected="Map" - layout="topleft" - name="map_button" - right="-5" - top_pad="5" - width="95" - enabled="false" /> <text type="string" follows="left|top" halign="right" - height="16" + height="15" layout="topleft" - left="5" + left="0" name="total_contributed_land_label" - top_pad="0" width="130"> - Total Contribution: + Total contribution: </text> <text text_color="EmphasisColor" type="string" follows="left|top" - height="16" + height="15" layout="topleft" left_pad="5" name="total_contributed_land_value" @@ -107,23 +95,34 @@ width="120"> [AREA] m² </text> + <button + follows="top" + height="20" + label="Map" + label_selected="Map" + layout="topleft" + name="map_button" + right="-5" + left_pad="0" + width="95" + enabled="false" /> <text type="string" follows="left|top" halign="right" - height="16" + height="15" layout="topleft" - left="5" + left="0" name="total_land_in_use_label" top_pad="0" width="130"> - Total Land In Use: + Total land in use: </text> <text text_color="EmphasisColor" type="string" follows="left|top" - height="16" + height="15" layout="topleft" left_pad="5" name="total_land_in_use_value" @@ -135,19 +134,19 @@ type="string" follows="left|top" halign="right" - height="16" + height="15" layout="topleft" - left="5" + left="0" name="land_available_label" top_pad="0" width="130"> - Land Available: + Land available: </text> <text text_color="EmphasisColor" type="string" follows="left|top" - height="16" + height="15" layout="topleft" left_pad="5" name="land_available_value" @@ -159,17 +158,15 @@ type="string" follows="left|top" halign="right" - height="16" + height="15" layout="topleft" - left="5" + left="0" name="your_contribution_label" top_pad="0" width="130"> - Your Contribution: + Your contribution: </text> <line_editor - border_style="line" - border_thickness="1" follows="left|top" height="19" layout="topleft" @@ -177,7 +174,7 @@ max_length="10" name="your_contribution_line_editor" top_delta="0" - width="95" /> + width="80" /> <text type="string" follows="left|top" @@ -194,7 +191,7 @@ type="string" follows="left|top" halign="right" - height="16" + height="12" layout="topleft" left="140" name="your_contribution_max_value" @@ -203,27 +200,27 @@ ([AMOUNT] max) </text> <icon - height="16" - image_name="notify_next" + height="18" + image_name="BuyArrow_Over" layout="topleft" - left="9" + left="75" name="group_over_limit_icon" top_pad="0" - visible="false" - width="16" /> + visible="true" + width="18" /> <text follows="left|top" type="string" word_wrap="true" font="SansSerifSmall" - height="35" + height="20" layout="topleft" - left_pad="5" + left_pad="2" name="group_over_limit_text" text_color="EmphasisColor" top_delta="0" - width="260"> - Group members must contribute more land credits to support land in use + width="213"> + More land credits are needed to support land in use </text> <text type="string" @@ -231,29 +228,29 @@ font="SansSerifBig" height="16" layout="topleft" - left="10" + left="0" name="group_money_heading" text_color="EmphasisColor" - top_pad="0" - width="150"> + top_pad="-15" + width="100"> Group L$ </text> <tab_container follows="all" - height="200" + height="173" halign="center" layout="topleft" - left="5" + left="0" name="group_money_tab_container" tab_position="top" tab_height="20" top_pad="2" - tab_min_width="70" - width="300"> + tab_min_width="75" + width="310"> <panel border="false" follows="all" - height="180" + height="173" label="PLANNING" layout="topleft" left="0" @@ -264,7 +261,6 @@ <text_editor type="string" follows="all" - font="SansSerif" height="140" layout="topleft" left="0" @@ -279,13 +275,13 @@ <panel border="false" follows="all" - height="180" + height="173" label="DETAILS" layout="topleft" left="0" help_topic="group_money_details_tab" name="group_money_details_tab" - top="5" + top="0" width="300"> <text_editor type="string" @@ -302,34 +298,34 @@ </text_editor> <button follows="left|top" - height="23" + height="18" image_overlay="Arrow_Left_Off" layout="topleft" name="earlier_details_button" tool_tip="Back" - top_pad="5" right="-45" - width="31" /> + bottom="0" + width="25" /> <button follows="left|top" - height="23" + height="18" image_overlay="Arrow_Right_Off" layout="topleft" left_pad="10" name="later_details_button" tool_tip="Next" - width="31" /> + width="25" /> </panel> <panel border="false" follows="all" - height="180" + height="173" label="SALES" layout="topleft" left_delta="0" help_topic="group_money_sales_tab" name="group_money_sales_tab" - top="5" + top="0" width="300"> <text_editor type="string" @@ -345,24 +341,24 @@ Loading... </text_editor> <button + bottom="0" follows="left|top" - height="23" + height="18" image_overlay="Arrow_Left_Off" layout="topleft" name="earlier_sales_button" tool_tip="Back" - top_pad="5" right="-45" - width="31" /> + width="25" /> <button follows="left|top" - height="23" + height="18" image_overlay="Arrow_Right_Off" layout="topleft" left_pad="10" name="later_sales_button" tool_tip="Next" - width="31" /> + width="25" /> </panel> </tab_container> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml index e56db6414f..0dea81eefe 100644 --- a/indra/newview/skins/default/xui/en/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel follows="all" - height="485" + height="463" label="Notices" layout="topleft" left="0" @@ -10,11 +10,10 @@ width="310"> <panel.string name="help_text"> - Notices are a quick way to communicate across a -group by broadcasting a message and delivering + Notices let you send a message and an optionally attached item. Notices only go to -group members in Roles granted the ability to -receive Notices. You can turn off Notices on +group members in Roles with the ability to +receive Notices. You can turn off Notices on the General tab. </panel.string> <panel.string @@ -25,14 +24,15 @@ the General tab. follows="left|top" type="string" word_wrap="true" - height="30" + height="24" + halign="right" layout="topleft" left="5" name="lbl2" top="5" width="300"> Notices are kept for 14 days -Groups are limited to 200 notices/group daily +Maximum 200 per group daily </text> <scroll_list follows="left|top" @@ -44,7 +44,7 @@ Groups are limited to 200 notices/group daily left="2" name="notice_list" top_pad="0" - width="305"> + width="300"> <scroll_list.columns label="" name="icon" @@ -52,15 +52,15 @@ Groups are limited to 200 notices/group daily <scroll_list.columns label="Subject" name="subject" - width="125" /> + width="110" /> <scroll_list.columns label="From" name="from" - width="90" /> + width="100" /> <scroll_list.columns label="Date" name="date" - width="30" /> + width="60" /> <scroll_list.columns name="sort" width="-1" /> @@ -84,7 +84,7 @@ Groups are limited to 200 notices/group daily left="5" name="create_new_notice" tool_tip="Create a new notice" - top_delta="0" + top_delta="-3" width="18" /> <button follows="top|left" @@ -97,14 +97,14 @@ Groups are limited to 200 notices/group daily width="23" /> <panel follows="left|top" - height="300" + height="280" label="Create New Notice" layout="topleft" left="0" - top_pad="10" - visible="false" + top_pad="0" + visible="true" name="panel_create_new_notice" - width="303"> + width="300"> <text follows="left|top" type="string" @@ -216,31 +216,31 @@ Groups are limited to 200 notices/group daily follows="left|top" height="23" label="Send" - label_selected="Send Notice" + label_selected="Send" layout="topleft" right="-10" top_pad="10" name="send_notice" width="100" /> <group_drop_target - height="466" - top="0" - left="0" + height="95" + top="160" + left="10" layout="topleft" name="drop_target" tool_tip="Drag an inventory item onto the message box to send it with the notice. You must have permission to copy and transfer the object to send it with the notice." - width="295" /> - </panel> + width="280" /> + </panel> <panel follows="left|top" - height="300" + height="280" label="View Past Notice" layout="topleft" left="0" - visible="true" + visible="false" name="panel_view_past_notice" top="180" - width="303"> + width="300"> <text type="string" font="SansSerifBig" @@ -303,7 +303,7 @@ Groups are limited to 200 notices/group daily </text> <text_editor enabled="false" - height="205" + height="160" layout="topleft" left="10" max_length="511" @@ -319,7 +319,7 @@ Groups are limited to 200 notices/group daily max_length="63" mouse_opaque="false" name="view_inventory_name" - top_pad="10" + top_pad="8" width="285" /> <icon height="16" diff --git a/indra/newview/skins/default/xui/en/panel_group_notify.xml b/indra/newview/skins/default/xui/en/panel_group_notify.xml index ef3120174e..9b0b81cd0a 100644 --- a/indra/newview/skins/default/xui/en/panel_group_notify.xml +++ b/indra/newview/skins/default/xui/en/panel_group_notify.xml @@ -1,77 +1,101 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel background_visible="true" bevel_style="in" bg_alpha_color="0 0 0 0" - height="155" label="instant_message" layout="topleft" left="0" - name="panel_group_notify" top="0" width="350"> +<panel + background_visible="true" + height="90" + label="instant_message" + layout="topleft" + left="0" + name="panel_group_notify" + top="0" + width="305"> <string - name="message_max_lines_count"> - 4 - </string> - <panel follows="top" background_visible="true" bevel_style="in" bg_alpha_color="black" - height="30" label="header" layout="topleft" left="0" name="header" - top="0" width="350"> - <icon follows="left|top|right|bottom" height="20" width="20" layout="topleft" - top="5" left="5" mouse_opaque="true" name="group_icon"/> - <text type="string" length="1" follows="left|top|right|bottom" - font="SansSerifBigBold" height="20" layout="topleft" left_pad="10" name="title" - text_color="GroupNotifyTextColor" top="5" width="275" use_ellipses="true"> - Sender Name / Group Name - </text> - </panel> - <text + name="message_max_lines_count" + value="7" /> + <string + name="subject_font" + value="SANSSERIF_BIG" /> + <string + name="date_font" + value="SANSSERIF" /> + <panel + background_visible="true" follows="top" - height="20" + height="30" + label="header" + layout="topleft" + left="0" + name="header" + top="0" + width="305"> + <icon + follows="all" + height="20" + layout="topleft" + left="5" + mouse_opaque="true" + name="group_icon" + top="5" + width="20" /> + <text + follows="all" + font="SansSerifBig" + height="20" + layout="topleft" + left_pad="10" + name="title" + text_color="GroupNotifyTextColor" + top="5" + use_ellipses="true" + value="Sender Name / Group Name" + width="230" /> + </panel> + <text_editor + allow_html="true" + enabled="true" + follows="all" + height="0" layout="topleft" left="25" - name="subject" + max_length="2147483647" + name="message" + parse_highlights="true" + read_only="true" text_color="GroupNotifyTextColor" - font="SansSerifBig" top="40" + type="string" use_ellipses="true" - value="subject" - width="300" - word_wrap="true"> - subject - </text> - <text - follows="top" - height="20" + value="message" + width="270" + word_wrap="true" > + </text_editor> + <icon + bottom="60" + follows="left|bottom|right" + height="15" layout="topleft" left="25" - name="datetime" - text_color="GroupNotifyTextColor" - font="SansSerif" - top="80" - use_ellipses="true" - value="datetime" - width="300" - word_wrap="true"> - datetime - </text> + mouse_opaque="true" + name="attachment_icon" + width="15" /> <text - follows="left|top|bottom|right" - height="0" + bottom="60" + follows="left|bottom|right" + font="SansSerif" + height="15" layout="topleft" - left="25" - name="message" + left="45" + name="attachment" text_color="GroupNotifyTextColor" - top="100" + value="Attachment" use_ellipses="true" - value="message" - width="300" - word_wrap="true" - visible="true" > - </text> - <icon - follows="left|bottom|right" height="15" width="15" - layout="topleft" bottom="122" left="25" mouse_opaque="true" name="attachment_icon" visible="true" - /> - <text font="SansSerif" font.style="UNDERLINE" font_shadow="none" - type="string" length="1" follows="left|bottom|right" layout="topleft" - left="45" bottom="122" height="15" width="280" name="attachment" - text_color="GroupNotifyTextColor" visible="true"> - Attachment - </text> - - <button label="OK" layout="topleft" bottom="145" left="140" height="20" - width="70" name="btn_ok" follows="bottom" /> -</panel>
\ No newline at end of file + width="250" /> + <button + bottom="85" + follows="bottom" + height="20" + label="Ok" + layout="topleft" + right="-10" + name="btn_ok" + width="70" /> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml index 604fb81c8e..5bae5c2711 100644 --- a/indra/newview/skins/default/xui/en/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - border="false" + follows="all" height="552" label="Members & Roles" layout="topleft" @@ -14,26 +14,27 @@ </panel.string> <panel.string name="want_apply_text"> - Do you want to save these changes? + Do you want to save your changes? </panel.string> <panel.string name="help_text" /> <tab_container border="false" follows="left|top" - height="245" + height="552" halign="center" layout="topleft" - left="5" + left="0" name="roles_tab_container" tab_position="top" tab_height="20" tab_min_width="75" - top="3" - width="300"> + top="0" + width="310"> <panel border="false" - height="220" + follows="all" + height="303" label="MEMBERS" layout="topleft" left="0" @@ -41,7 +42,7 @@ name="members_sub_tab" tool_tip="Members" class="panel_group_members_subtab" - width="300"> + width="310"> <panel.string name="help_text"> You can add or remove Roles assigned to Members. @@ -50,11 +51,11 @@ clicking on their names. </panel.string> <filter_editor layout="topleft" - top="10" + top="5" left="5" width="280" height="20" - follows="left|top|right" + follows="top" max_length="250" label="Filter Members" name="filter_input" /> @@ -62,7 +63,7 @@ clicking on their names. column_padding="0" draw_heading="true" heading_height="20" - height="160" + height="240" follows="left|top" layout="topleft" left="0" @@ -73,30 +74,26 @@ clicking on their names. <name_list.columns label="Member" name="name" - relative_width="0.45" /> + relative_width="0.44" /> <name_list.columns - label="Donations" + label="Donation" name="donated" - relative_width="0.3" /> + relative_width="0.25" /> <name_list.columns - label="Online" + label="Status" name="online" - relative_width="0.2" /> + relative_width="0.15" /> </name_list> <button height="20" - font="SansSerifSmall" + follows="bottom|left" label="Invite" - layout="topleft" left="5" name="member_invite" - top_pad="3" width="100" /> <button height="20" - font="SansSerifSmall" label="Eject" - layout="topleft" left_pad="5" right="-5" name="member_eject" @@ -104,14 +101,23 @@ clicking on their names. </panel> <panel border="false" - height="220" + height="230" label="ROLES" layout="topleft" left="0" help_topic="roles_roles_tab" name="roles_sub_tab" class="panel_group_roles_subtab" - width="300"> + width="310"> + <!-- <button + enabled="false" + height="20" + label="Show All" + layout="topleft" + top="-65" + right="-5" + name="show_all_button" + width="100" />--> <panel.string name="help_text"> Roles have a title and an allowed list of Abilities @@ -121,7 +127,7 @@ including the Everyone and Owner Roles. </panel.string> <panel.string name="cant_delete_role"> - The 'Everyone' and 'Owners' Roles are special and cannot be deleted. + The 'Everyone' and 'Owners' Roles are special and can't be deleted. </panel.string> <panel.string name="power_folder_icon"> @@ -129,15 +135,15 @@ including the Everyone and Owner Roles. </panel.string> <panel.string name="power_all_have_icon"> - checkbox_enabled_true.tga + Checkbox_On </panel.string> <panel.string name="power_partial_icon"> - checkbox_enabled_false.tga + Checkbox_Off </panel.string> <filter_editor layout="topleft" - top="10" + top="5" left="5" width="280" height="20" @@ -145,61 +151,48 @@ including the Everyone and Owner Roles. max_length="250" label="Filter Roles" name="filter_input" /> - <!-- - <button - enabled="false" - height="20" - label="Show All" - layout="topleft" - left_pad="0" - name="show_all_button" - top_delta="0" - width="80" /> --> <scroll_list column_padding="0" draw_heading="true" draw_stripes="false" follows="left|top" heading_height="20" - height="160" + height="170" layout="topleft" search_column="1" left="0" name="role_list" top_pad="2" - width="300"> + width="310"> <scroll_list.columns label="Role" name="name" - width="80" /> + relative_width="0.45" /> <scroll_list.columns label="Title" name="title" - width="90" /> + relative_width="0.45" /> <scroll_list.columns - label="Members" + label="#" name="members" - width="95" /> + relative_width="0.15" /> </scroll_list> <button + follows="bottom|left" height="20" - font="SansSerifSmall" - label="Add Role" + label="New Role" layout="topleft" left="5" name="role_create" - top_pad="6" - width="125" /> + width="100" /> <button height="20" - font="SansSerifSmall" label="Delete Role" layout="topleft" left_pad="5" right="-5" name="role_delete" - top_delta="0" - width="125" /> + width="100" /> </panel> <panel border="false" @@ -211,7 +204,7 @@ including the Everyone and Owner Roles. name="actions_sub_tab" class="panel_group_actions_subtab" tool_tip="You can view an Ability's Description and which Roles and Members can execute the Ability." - width="300"> + width="310"> <panel.string name="help_text"> Abilities allow Members in Roles to do specific @@ -219,7 +212,7 @@ things in this group. There's a broad variety of Abilities. </panel.string> <filter_editor layout="topleft" - top="10" + top="5" left="5" width="280" height="20" @@ -231,74 +224,63 @@ things in this group. There's a broad variety of Abilities. column_padding="0" draw_stripes="false" follows="left|top" - height="160" + height="200" layout="topleft" left="0" multi_select="true" name="action_list" search_column="1" tool_tip="Select an Ability to view more details" - top_pad="2" + top_pad="5" width="300"> <scroll_list.columns - label="" - name="icon" - width="16" /> - <scroll_list.columns - label="Action" name="action" - width="247" /> + width="300" /> </scroll_list> - <icon - height="16" - image_name="Inv_FolderClosed" - layout="topleft" - name="power_folder_icon" - visible="false" - width="16" /> </panel> </tab_container> <panel height="252" layout="topleft" follows="left|top" - left="10" + left="0" + mouse_opaque="false" name="members_footer" - top="245" - top_delta="0" - width="290"> + top="300" + visible="false" + width="310"> <text type="string" - height="16" + height="14" layout="topleft" follows="left|top" left="0" name="static" top_pad="5" - width="285"> + width="300"> Assigned Roles </text> <scroll_list - draw_stripes="false" + draw_stripes="true" follows="left|top" - height="80" + height="90" layout="topleft" left="0" name="member_assigned_roles" top_pad="0" - width="285"> + width="300"> <scroll_list.columns label="" name="checkbox" - width="30" /> + width="20" /> <scroll_list.columns label="" name="role" - width="255" /> + width="270" /> </scroll_list> <text type="string" - height="16" + height="14" layout="topleft" follows="left|top" left="0" @@ -308,48 +290,42 @@ things in this group. There's a broad variety of Abilities. Allowed Abilities </text> <scroll_list - draw_stripes="false" - height="80" + draw_stripes="true" + height="90" layout="topleft" left="0" name="member_allowed_actions" search_column="2" tool_tip="For details of each allowed ability see the abilities tab" top_pad="0" - width="285"> - <scroll_list.columns - label="" - name="icon" - width="20" /> + width="300"> <scroll_list.columns label="" name="action" - width="265" /> + width="300" /> </scroll_list> </panel> <panel height="297" layout="topleft" - left="10" + left="0" name="roles_footer" top_delta="0" - top="245" + top="220" visible="false" - width="290"> + width="310"> <text type="string" - height="16" + height="14" layout="topleft" left="0" name="static" top="0" - width="140"> - Name + width="300"> + Role Name </text> <line_editor type="string" - border_style="line" - border_thickness="1" follows="left|top" height="20" layout="topleft" @@ -357,106 +333,97 @@ things in this group. There's a broad variety of Abilities. max_length="295" name="role_name" top_pad="0" - width="290"> - Employees + width="300"> </line_editor> <text type="string" - height="16" + height="14" layout="topleft" name="static3" top_pad="5" - width="290"> - Title + width="300"> + Role Title </text> <line_editor type="string" - border_style="line" - border_thickness="1" follows="left|top" height="20" layout="topleft" max_length="295" name="role_title" top_pad="0" - width="290"> - (waiting) + width="300"> </line_editor> <text type="string" - height="16" + height="14" layout="topleft" left="0" name="static2" top_pad="5" - width="100"> + width="200"> Description </text> <text_editor type="string" halign="left" - height="35" + height="50" layout="topleft" left="0" max_length="295" name="role_description" top_pad="0" - width="295" + width="300" word_wrap="true"> - (waiting) </text_editor> <text type="string" - height="16" + height="14" layout="topleft" follows="left|top" left="0" name="static4" top_pad="5" - width="290"> - Assigned Roles + width="300"> + Assigned Members </text> <name_list - draw_stripes="false" - height="50" + draw_stripes="true" + height="60" layout="topleft" left="0" name="role_assigned_members" top_pad="0" - width="290" /> + width="300" /> <check_box height="15" label="Reveal members" layout="topleft" name="role_visible_in_list" tool_tip="Sets whether members of this role are visible in the General tab to people outside of the group." - top_pad="3" - width="290" /> + top_pad="4" + width="300" /> <text type="string" - height="16" + height="13" layout="topleft" follows="left|top" left="0" name="static5" top_pad="5" - width="290"> + width="300"> Allowed Abilities </text> <scroll_list - draw_stripes="false" - height="50" + draw_stripes="true" + height="60" layout="topleft" left="0" name="role_allowed_actions" search_column="2" tool_tip="For details of each allowed ability see the abilities tab" top_pad="0" - width="295"> - <scroll_list.columns - label="" - name="icon" - width="20" /> + width="300"> <scroll_list.columns label="" name="checkbox" @@ -464,33 +431,27 @@ things in this group. There's a broad variety of Abilities. <scroll_list.columns label="" name="action" - width="250" /> + width="270" /> </scroll_list> </panel> <panel height="303" layout="topleft" - left="10" + left="0" name="actions_footer" top_delta="0" - top="245" + top="255" visible="false" - width="290"> - <text - type="string" - height="16" - layout="topleft" - name="static" - width="200"> - Ability description - </text> + width="310"> <text_editor + bg_readonly_color="Transparent" + text_readonly_color="EmphasisColor" + font="SansSerifSmall" type="string" enabled="false" halign="left" - height="80" + height="90" layout="topleft" - left_delta="0" max_length="512" name="action_description" top_pad="0" @@ -500,28 +461,28 @@ things in this group. There's a broad variety of Abilities. </text_editor> <text type="string" - height="16" + height="14" layout="topleft" - left_delta="0" + left="5" name="static2" top_pad="5" - width="295"> + width="300"> Roles with this ability </text> <scroll_list - height="60" + height="65" layout="topleft" - left="0" + left="5" name="action_roles" top_pad="0" - width="295" /> - <text + width="300" /> + <text type="string" - height="16" + height="14" layout="topleft" name="static3" top_pad="5" - width="290"> + width="300"> Members with this ability </text> <name_list @@ -529,6 +490,6 @@ things in this group. There's a broad variety of Abilities. layout="topleft" name="action_members" top_pad="0" - width="290" /> + width="300" /> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml index e81532ec3e..0a5812882d 100644 --- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml @@ -1,101 +1,87 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel border="false" - height="350" + height="300" name="panel_im_control_panel" - width="131"> - + width="110"> <avatar_icon follows="left|top" - height="125" - left_delta="3" + height="100" + left_delta="5" name="avatar_icon" - top="-10" - width="125"/> - + top="-5" + width="100"/> <text follows="top|left|right" - font="SansSerifBig" - height="16" + font="SansSerifLarge" + height="22" layout="topleft" name="avatar_name" use_ellipses="true" value="Unknown" - width="125" /> - + width="100" /> <button - follows="left|bottom" + follows="left|top" height="20" - label="View Profile" + label="Profile" name="view_profile_btn" - width="125"/> - + width="100" /> <button - follows="left|bottom" + follows="left|top" height="20" label="Add Friend" name="add_friend_btn" - width="125"/> - + width="100" /> <button - follows="left|bottom" + follows="left|top" height="20" label="Teleport" name="teleport_btn" - width="125"/> - - <button - follows="left|bottom" + width="100" /> + <button + follows="left|top" height="20" label="Share" name="share_btn" - width="125"/> - - <button - follows="left|bottom" + width="100" /> + <!--Removing pay button to save space - will update spec - verified by Erica/Steve --> + <!-- <button + follows="left|top" height="20" label="Pay" name="pay_btn" - width="125"/> - + width="100" />--> <panel background_visible="true" - bg_alpha_color="0.2 0.2 0.2 1" + bg_alpha_color="DkGray2" border="false" - bottom="1" + top_pad="10" follows="left|bottom" height="70" - left="0" - left_pad="0" + left="1" name="panel_call_buttons" - top_pad="0" - width="131"> - + width="109"> <button bottom="10" height="20" label="Call" - left_delta="3" + left_delta="5" name="call_btn" - width="125"/> - + width="100" /> <button - bottom="40" + bottom="35" height="20" label="Leave Call" name="end_call_btn" visible="false" - width="125"/> - + width="100" /> <button enabled="false" bottom="10" height="20" - label="Open Voice Controls" + label="Voice Controls" name="voice_ctrls_btn" visible="false" - width="125"/> - + width="100" /> </panel> - </panel> diff --git a/indra/newview/skins/default/xui/en/panel_instant_message.xml b/indra/newview/skins/default/xui/en/panel_instant_message.xml index be56866119..1e570bf207 100644 --- a/indra/newview/skins/default/xui/en/panel_instant_message.xml +++ b/indra/newview/skins/default/xui/en/panel_instant_message.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel background_visible="true" - bg_alpha_color="0.3 0.3 0.3 0" height="175" label="im_panel" layout="topleft" @@ -18,7 +17,7 @@ bevel_style="in" bg_alpha_color="black" follows="top" - height="20" + height="24" label="im_header" layout="topleft" left="5" @@ -27,52 +26,53 @@ width="295"> <avatar_icon follows="right" - height="20" - image_name="icon_avatar_online.tga" + height="18" + image_name="Generic_Person" layout="topleft" - left="0" + left="3" mouse_opaque="true" name="avatar_icon" - top="0" - width="20" /> - <icon + top="3" + width="18" /> + <!--<icon follows="right" height="20" - image_name="icon_top_pick.tga" + image_name="" layout="topleft" - left="0" + left="3" mouse_opaque="true" name="sys_msg_icon" top="0" - width="20" /> + width="20" />--> <text follows="left|right" - font="SansSerifBold" - height="20" + font.style="BOLD" + height="12" layout="topleft" left_pad="5" name="user_name" text_color="white" - top="5" - value="Darth Vader" - width="295" /> + top="8" + use_ellipses="true" + value="Erica Vader" + width="212" /> <!-- TIME STAMP --> <text + font="SansSerifSmall" follows="right" - font="SansSerif" - height="20" + height="13" layout="topleft" halign="right" - left="245" + right="-5" name="time_box" - text_color="white" - top="5" + top="8" value="23:30" width="50" /> </panel> <text - follows="left|top|bottom|right" - height="86" + font="SansSerifSmall" + follows="all" + height="97" layout="topleft" left="10" name="message" @@ -85,12 +85,11 @@ max_length="350" /> <button follows="bottom" - font="SansSerifBold" - height="25" + height="23" label="Reply" layout="topleft" - left="97" + left="100" name="reply" - top="137" - width="110" /> + top="144" + width="100" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml index b01ddbf75a..a219e30b8b 100644 --- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml @@ -87,8 +87,8 @@ width="313"> <panel bg_alpha_color="DkGray2" - follows="all" - height="533" + follows="left|top|right" + height="610" layout="topleft" left="0" min_height="300" @@ -145,7 +145,7 @@ top_pad="10" width="18" /> <text - follows="right|top" + follows="left|top|right" height="16" layout="topleft" left_pad="8" diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml index f05684db10..4b91dc6294 100644 --- a/indra/newview/skins/default/xui/en/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml @@ -63,7 +63,7 @@ left="0" mouse_opaque="true" name="my_inventory_list" - start_folder="INVENTORY" + start_folder="My Inventory" width="380"/> </accordion_tab> <accordion_tab diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index cb5ec15387..a9a02e8fc7 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -27,6 +27,7 @@ border_visible="false" bottom="600" follows="all" + hide_loading="true" left="0" name="login_html" start_url="" diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml index fcee0ef953..37d59de66f 100644 --- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml @@ -1,467 +1,467 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- background_visible="true"
- follows="all"
- height="400"
- label="Things"
- layout="topleft"
- min_height="350"
- min_width="240"
- name="main inventory panel"
- width="330">
- <panel.string
- name="Title">
- Things
- </panel.string>
- <filter_editor
- text_pad_left="12"
- follows="left|top|right"
- font="SanSerif"
- height="20"
- label="Filter"
- layout="topleft"
- left="15"
- name="inventory search editor"
- top="34"
- width="300" />
- <tab_container
- follows="left|top|right|bottom"
- height="300"
- layout="topleft"
- left_delta="-4"
- name="inventory filter tabs"
- tab_position="top"
- top_pad="4"
- width="305">
- <inventory_panel
- follows="left|top|right|bottom"
- height="295"
- label="All Items"
- layout="topleft"
- left="1"
- name="All Items"
- top="16"
- width="290" />
- <inventory_panel
- follows="left|top|right|bottom"
- height="295"
- label="Recent Items"
- layout="topleft"
- left_delta="0"
- name="Recent Items"
- top_delta="0"
- width="290" />
- </tab_container>
-
- <panel
- background_visible="true"
- bevel_style="none"
- bottom="0"
- follows="left|right|bottom"
- height="30"
- layout="bottomleft"
- left="0"
- visible="true"
- name="bottom_panel"
- width="330">
- <button
- follows="bottom|left"
- tool_tip="Show additional options"
- height="18"
- image_disabled="OptionsMenu_Disabled"
- image_selected="OptionsMenu_Press"
- image_unselected="OptionsMenu_Off"
- layout="topleft"
- left="10"
- name="options_gear_btn"
- picture_style="true"
- top="6"
- width="18" />
- <button
- follows="bottom|left"
- height="18"
- image_selected="AddItem_Press"
- image_unselected="AddItem_Off"
- image_disabled="AddItem_Disabled"
- layout="topleft"
- left_pad="5"
- name="add_btn"
- picture_style="true"
- tool_tip="Add new item"
- width="18" />
- <dnd_button
- follows="bottom|right"
- height="18"
- image_selected="TrashItem_Press"
- image_unselected="TrashItem_Off"
- layout="topleft"
- right="-5"
- name="trash_btn"
- picture_style="true"
- tool_tip="Remove selected item"
- top="6"
- width="18" />
- </panel>
-
- <menu_bar
- bg_visible="false"
- follows="left|top|right"
- height="18"
- layout="topleft"
- left_delta="0"
- mouse_opaque="false"
- name="Inventory Menu"
- top="15"
- visible="true"
- width="290">
- <menu
- height="101"
- label="File"
- layout="topleft"
- left="0"
- mouse_opaque="false"
- name="File"
- tear_off="true"
- top="-117"
- width="128">
- <menu_item_call
- label="Open"
- layout="topleft"
- name="Open">
- <menu_item_call.on_click
- function="Inventory.DoToSelected"
- parameter="open" />
- </menu_item_call>
- <menu
- create_jump_keys="true"
- label="Upload"
- layout="topleft"
- name="upload"
- tear_off="true">
- <menu_item_call
- label="Image (L$[COST])..."
- layout="topleft"
- name="Upload Image"
- shortcut="control|U">
- <menu_item_call.on_click
- function="File.UploadImage"
- parameter="" />
- <menu_item_call.on_enable
- function="File.EnableUpload" />
- </menu_item_call>
- <menu_item_call
- label="Sound (L$[COST])..."
- layout="topleft"
- name="Upload Sound">
- <menu_item_call.on_click
- function="File.UploadSound"
- parameter="" />
- <menu_item_call.on_enable
- function="File.EnableUpload" />
- </menu_item_call>
- <menu_item_call
- label="Animation (L$[COST])..."
- layout="topleft"
- name="Upload Animation">
- <menu_item_call.on_click
- function="File.UploadAnim"
- parameter="" />
- <menu_item_call.on_enable
- function="File.EnableUpload" />
- </menu_item_call>
- <menu_item_call
- label="Bulk (L$[COST] per file)..."
- layout="topleft"
- name="Bulk Upload">
- <menu_item_call.on_click
- function="File.UploadBulk"
- parameter="" />
- </menu_item_call>
- <menu_item_separator
- layout="topleft" />
- </menu>
- <menu_item_separator
- layout="topleft" />
- <menu_item_call
- label="New Window"
- layout="topleft"
- name="New Window">
- <menu_item_call.on_click
- function="Inventory.NewWindow" />
- </menu_item_call>
- <menu_item_separator
- layout="topleft"
- name="separator2" />
- <menu_item_call
- label="Show Filters"
- layout="topleft"
- name="Show Filters">
- <menu_item_call.on_click
- function="Inventory.ShowFilters" />
- </menu_item_call>
- <menu_item_call
- label="Reset Filters"
- layout="topleft"
- name="Reset Current">
- <menu_item_call.on_click
- function="Inventory.ResetFilter" />
- </menu_item_call>
- <menu_item_call
- label="Close All Folders"
- layout="topleft"
- name="Close All Folders">
- <menu_item_call.on_click
- function="Inventory.CloseAllFolders" />
- </menu_item_call>
- <menu_item_separator
- layout="topleft"
- name="separator3" />
- <menu_item_call
- label="Empty Trash"
- layout="topleft"
- name="Empty Trash">
- <menu_item_call.on_click
- function="Inventory.EmptyTrash" />
- </menu_item_call>
- <menu_item_call
- label="Empty Lost And Found"
- layout="topleft"
- name="Empty Lost And Found">
- <menu_item_call.on_click
- function="Inventory.EmptyLostAndFound" />
- </menu_item_call>
- </menu>
- <menu
- height="121"
- label="Create"
- layout="topleft"
- left="0"
- mouse_opaque="false"
- name="Create"
- tear_off="true"
- top="-201"
- width="121">
- <menu_item_call
- label="New Folder"
- layout="topleft"
- name="New Folder">
- <menu_item_call.on_click
- function="Inventory.DoCreate"
- parameter="category" />
- </menu_item_call>
- <menu_item_call
- label="New Script"
- layout="topleft"
- name="New Script">
- <menu_item_call.on_click
- function="Inventory.DoCreate"
- parameter="lsl" />
- </menu_item_call>
- <menu_item_call
- label="New Note"
- layout="topleft"
- name="New Note">
- <menu_item_call.on_click
- function="Inventory.DoCreate"
- parameter="notecard" />
- </menu_item_call>
- <menu_item_call
- label="New Gesture"
- layout="topleft"
- name="New Gesture">
- <menu_item_call.on_click
- function="Inventory.DoCreate"
- parameter="gesture" />
- </menu_item_call>
- <menu
- height="175"
- label="New Clothes"
- layout="topleft"
- left_delta="0"
- mouse_opaque="false"
- name="New Clothes"
- top_pad="514"
- width="125">
- <menu_item_call
- label="New Shirt"
- layout="topleft"
- name="New Shirt">
- <menu_item_call.on_click
- function="Inventory.DoCreate"
- parameter="shirt" />
- </menu_item_call>
- <menu_item_call
- label="New Pants"
- layout="topleft"
- name="New Pants">
- <menu_item_call.on_click
- function="Inventory.DoCreate"
- parameter="pants" />
- </menu_item_call>
- <menu_item_call
- label="New Shoes"
- layout="topleft"
- name="New Shoes">
- <menu_item_call.on_click
- function="Inventory.DoCreate"
- parameter="shoes" />
- </menu_item_call>
- <menu_item_call
- label="New Socks"
- layout="topleft"
- name="New Socks">
- <menu_item_call.on_click
- function="Inventory.DoCreate"
- parameter="socks" />
- </menu_item_call>
- <menu_item_call
- label="New Jacket"
- layout="topleft"
- name="New Jacket">
- <menu_item_call.on_click
- function="Inventory.DoCreate"
- parameter="jacket" />
- </menu_item_call>
- <menu_item_call
- label="New Skirt"
- layout="topleft"
- name="New Skirt">
- <menu_item_call.on_click
- function="Inventory.DoCreate"
- parameter="skirt" />
- </menu_item_call>
- <menu_item_call
- label="New Gloves"
- layout="topleft"
- name="New Gloves">
- <menu_item_call.on_click
- function="Inventory.DoCreate"
- parameter="gloves" />
- </menu_item_call>
- <menu_item_call
- label="New Undershirt"
- layout="topleft"
- name="New Undershirt">
- <menu_item_call.on_click
- function="Inventory.DoCreate"
- parameter="undershirt" />
- </menu_item_call>
- <menu_item_call
- label="New Underpants"
- layout="topleft"
- name="New Underpants">
- <menu_item_call.on_click
- function="Inventory.DoCreate"
- parameter="underpants" />
- </menu_item_call>
- <menu_item_call
- label="New Alpha"
- layout="topleft"
- name="New Alpha">
- <menu_item_call.on_click
- function="Inventory.DoCreate"
- parameter="alpha" />
- </menu_item_call>
- <menu_item_call
- label="New Tattoo"
- layout="topleft"
- name="New Tattoo">
- <menu_item_call.on_click
- function="Inventory.DoCreate"
- parameter="tattoo" />
- </menu_item_call>
- </menu>
- <menu
- height="85"
- label="New Body Parts"
- layout="topleft"
- left_delta="0"
- mouse_opaque="false"
- name="New Body Parts"
- top_pad="514"
- width="118">
- <menu_item_call
- label="New Shape"
- layout="topleft"
- name="New Shape">
- <menu_item_call.on_click
- function="Inventory.DoCreate"
- parameter="shape" />
- </menu_item_call>
- <menu_item_call
- label="New Skin"
- layout="topleft"
- name="New Skin">
- <menu_item_call.on_click
- function="Inventory.DoCreate"
- parameter="skin" />
- </menu_item_call>
- <menu_item_call
- label="New Hair"
- layout="topleft"
- name="New Hair">
- <menu_item_call.on_click
- function="Inventory.DoCreate"
- parameter="hair" />
- </menu_item_call>
- <menu_item_call
- label="New Eyes"
- layout="topleft"
- name="New Eyes">
- <menu_item_call.on_click
- function="Inventory.DoCreate"
- parameter="eyes" />
- </menu_item_call>
- </menu>
- </menu>
- <menu
- height="49"
- label="Sort"
- layout="topleft"
- left="0"
- mouse_opaque="false"
- name="Sort"
- tear_off="true"
- top="-113"
- width="118">
- <menu_item_check
- control_name="Inventory.SortByName"
- label="By Name"
- layout="topleft"
- name="By Name">
- <menu_item_check.on_click
- function="Inventory.SetSortBy"
- parameter="name" />
- </menu_item_check>
- <menu_item_check
- control_name="Inventory.SortByDate"
- label="By Date"
- layout="topleft"
- name="By Date">
- <menu_item_check.on_click
- function="Inventory.SetSortBy"
- parameter="date" />
- </menu_item_check>
- <menu_item_separator
- layout="topleft" />
- <menu_item_check
- control_name="Inventory.FoldersAlwaysByName"
- label="Folders Always By Name"
- layout="topleft"
- name="Folders Always By Name">
- <menu_item_check.on_click
- function="Inventory.SetSortBy"
- parameter="foldersalwaysbyname" />
- </menu_item_check>
- <menu_item_check
- control_name="Inventory.SystemFoldersToTop"
- label="System Folders To Top"
- layout="topleft"
- name="System Folders To Top">
- <menu_item_check.on_click
- function="Inventory.SetSortBy"
- parameter="systemfolderstotop" />
- </menu_item_check>
- </menu>
- </menu_bar>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + background_visible="true" + follows="all" + height="400" + label="Things" + layout="topleft" + min_height="350" + min_width="240" + name="main inventory panel" + width="330"> + <panel.string + name="Title"> + Things + </panel.string> + <filter_editor + text_pad_left="14" + follows="left|top|right" + font="SanSerif" + height="20" + label="Filter" + layout="topleft" + left="15" + name="inventory search editor" + top="34" + width="300" /> + <tab_container + follows="left|top|right|bottom" + height="300" + layout="topleft" + left_delta="-4" + name="inventory filter tabs" + tab_position="top" + top_pad="4" + width="305"> + <inventory_panel + follows="left|top|right|bottom" + height="295" + label="All Items" + layout="topleft" + left="1" + name="All Items" + top="16" + width="290" /> + <inventory_panel + follows="left|top|right|bottom" + height="295" + label="Recent Items" + layout="topleft" + left_delta="0" + name="Recent Items" + top_delta="0" + width="290" /> + </tab_container> + + <panel + background_visible="true" + bevel_style="none" + bottom="0" + follows="left|right|bottom" + height="30" + layout="bottomleft" + left="0" + visible="true" + name="bottom_panel" + width="330"> + <button + follows="bottom|left" + tool_tip="Show additional options" + height="18" + image_disabled="OptionsMenu_Disabled" + image_selected="OptionsMenu_Press" + image_unselected="OptionsMenu_Off" + layout="topleft" + left="10" + name="options_gear_btn" + picture_style="true" + top="6" + width="18" /> + <button + follows="bottom|left" + height="18" + image_selected="AddItem_Press" + image_unselected="AddItem_Off" + image_disabled="AddItem_Disabled" + layout="topleft" + left_pad="5" + name="add_btn" + picture_style="true" + tool_tip="Add new item" + width="18" /> + <dnd_button + follows="bottom|right" + height="18" + image_selected="TrashItem_Press" + image_unselected="TrashItem_Off" + layout="topleft" + right="-5" + name="trash_btn" + picture_style="true" + tool_tip="Remove selected item" + top="6" + width="18" /> + </panel> + + <menu_bar + bg_visible="false" + follows="left|top|right" + height="18" + layout="topleft" + left_delta="0" + mouse_opaque="false" + name="Inventory Menu" + top="15" + visible="true" + width="290"> + <menu + height="101" + label="File" + layout="topleft" + left="0" + mouse_opaque="false" + name="File" + tear_off="true" + top="-117" + width="128"> + <menu_item_call + label="Open" + layout="topleft" + name="Open"> + <menu_item_call.on_click + function="Inventory.DoToSelected" + parameter="open" /> + </menu_item_call> + <menu + create_jump_keys="true" + label="Upload" + layout="topleft" + name="upload" + tear_off="true"> + <menu_item_call + label="Image (L$[COST])..." + layout="topleft" + name="Upload Image" + shortcut="control|U"> + <menu_item_call.on_click + function="File.UploadImage" + parameter="" /> + <menu_item_call.on_enable + function="File.EnableUpload" /> + </menu_item_call> + <menu_item_call + label="Sound (L$[COST])..." + layout="topleft" + name="Upload Sound"> + <menu_item_call.on_click + function="File.UploadSound" + parameter="" /> + <menu_item_call.on_enable + function="File.EnableUpload" /> + </menu_item_call> + <menu_item_call + label="Animation (L$[COST])..." + layout="topleft" + name="Upload Animation"> + <menu_item_call.on_click + function="File.UploadAnim" + parameter="" /> + <menu_item_call.on_enable + function="File.EnableUpload" /> + </menu_item_call> + <menu_item_call + label="Bulk (L$[COST] per file)..." + layout="topleft" + name="Bulk Upload"> + <menu_item_call.on_click + function="File.UploadBulk" + parameter="" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + </menu> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="New Window" + layout="topleft" + name="New Window"> + <menu_item_call.on_click + function="Inventory.NewWindow" /> + </menu_item_call> + <menu_item_separator + layout="topleft" + name="separator2" /> + <menu_item_call + label="Show Filters" + layout="topleft" + name="Show Filters"> + <menu_item_call.on_click + function="Inventory.ShowFilters" /> + </menu_item_call> + <menu_item_call + label="Reset Filters" + layout="topleft" + name="Reset Current"> + <menu_item_call.on_click + function="Inventory.ResetFilter" /> + </menu_item_call> + <menu_item_call + label="Close All Folders" + layout="topleft" + name="Close All Folders"> + <menu_item_call.on_click + function="Inventory.CloseAllFolders" /> + </menu_item_call> + <menu_item_separator + layout="topleft" + name="separator3" /> + <menu_item_call + label="Empty Trash" + layout="topleft" + name="Empty Trash"> + <menu_item_call.on_click + function="Inventory.EmptyTrash" /> + </menu_item_call> + <menu_item_call + label="Empty Lost And Found" + layout="topleft" + name="Empty Lost And Found"> + <menu_item_call.on_click + function="Inventory.EmptyLostAndFound" /> + </menu_item_call> + </menu> + <menu + height="121" + label="Create" + layout="topleft" + left="0" + mouse_opaque="false" + name="Create" + tear_off="true" + top="-201" + width="121"> + <menu_item_call + label="New Folder" + layout="topleft" + name="New Folder"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="category" /> + </menu_item_call> + <menu_item_call + label="New Script" + layout="topleft" + name="New Script"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="lsl" /> + </menu_item_call> + <menu_item_call + label="New Note" + layout="topleft" + name="New Note"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="notecard" /> + </menu_item_call> + <menu_item_call + label="New Gesture" + layout="topleft" + name="New Gesture"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="gesture" /> + </menu_item_call> + <menu + height="175" + label="New Clothes" + layout="topleft" + left_delta="0" + mouse_opaque="false" + name="New Clothes" + top_pad="514" + width="125"> + <menu_item_call + label="New Shirt" + layout="topleft" + name="New Shirt"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="shirt" /> + </menu_item_call> + <menu_item_call + label="New Pants" + layout="topleft" + name="New Pants"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="pants" /> + </menu_item_call> + <menu_item_call + label="New Shoes" + layout="topleft" + name="New Shoes"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="shoes" /> + </menu_item_call> + <menu_item_call + label="New Socks" + layout="topleft" + name="New Socks"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="socks" /> + </menu_item_call> + <menu_item_call + label="New Jacket" + layout="topleft" + name="New Jacket"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="jacket" /> + </menu_item_call> + <menu_item_call + label="New Skirt" + layout="topleft" + name="New Skirt"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="skirt" /> + </menu_item_call> + <menu_item_call + label="New Gloves" + layout="topleft" + name="New Gloves"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="gloves" /> + </menu_item_call> + <menu_item_call + label="New Undershirt" + layout="topleft" + name="New Undershirt"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="undershirt" /> + </menu_item_call> + <menu_item_call + label="New Underpants" + layout="topleft" + name="New Underpants"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="underpants" /> + </menu_item_call> + <menu_item_call + label="New Alpha" + layout="topleft" + name="New Alpha"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="alpha" /> + </menu_item_call> + <menu_item_call + label="New Tattoo" + layout="topleft" + name="New Tattoo"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="tattoo" /> + </menu_item_call> + </menu> + <menu + height="85" + label="New Body Parts" + layout="topleft" + left_delta="0" + mouse_opaque="false" + name="New Body Parts" + top_pad="514" + width="118"> + <menu_item_call + label="New Shape" + layout="topleft" + name="New Shape"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="shape" /> + </menu_item_call> + <menu_item_call + label="New Skin" + layout="topleft" + name="New Skin"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="skin" /> + </menu_item_call> + <menu_item_call + label="New Hair" + layout="topleft" + name="New Hair"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="hair" /> + </menu_item_call> + <menu_item_call + label="New Eyes" + layout="topleft" + name="New Eyes"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="eyes" /> + </menu_item_call> + </menu> + </menu> + <menu + height="49" + label="Sort" + layout="topleft" + left="0" + mouse_opaque="false" + name="Sort" + tear_off="true" + top="-113" + width="118"> + <menu_item_check + control_name="Inventory.SortByName" + label="By Name" + layout="topleft" + name="By Name"> + <menu_item_check.on_click + function="Inventory.SetSortBy" + parameter="name" /> + </menu_item_check> + <menu_item_check + control_name="Inventory.SortByDate" + label="By Date" + layout="topleft" + name="By Date"> + <menu_item_check.on_click + function="Inventory.SetSortBy" + parameter="date" /> + </menu_item_check> + <menu_item_separator + layout="topleft" /> + <menu_item_check + control_name="Inventory.FoldersAlwaysByName" + label="Folders Always By Name" + layout="topleft" + name="Folders Always By Name"> + <menu_item_check.on_click + function="Inventory.SetSortBy" + parameter="foldersalwaysbyname" /> + </menu_item_check> + <menu_item_check + control_name="Inventory.SystemFoldersToTop" + label="System Folders To Top" + layout="topleft" + name="System Folders To Top"> + <menu_item_check.on_click + function="Inventory.SetSortBy" + parameter="systemfolderstotop" /> + </menu_item_check> + </menu> + </menu_bar> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_me.xml b/indra/newview/skins/default/xui/en/panel_me.xml new file mode 100644 index 0000000000..a99777848b --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_me.xml @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + background_visible="true" + border="false" + follows="all" + height="570" + label="My Profile" + layout="topleft" + left="0" + 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="575" + halign="center" + layout="topleft" + left="10" + name="tabs" + tab_min_width="95" + tab_height="30" + tab_position="top" + top_pad="10" + width="313"> + <panel + class="panel_my_profile" + filename="panel_my_profile.xml" + label="PROFILE" + help_topic="panel_my_profile_tab" + name="panel_profile" /> + <panel + class="panel_picks" + filename="panel_picks.xml" + label="PICKS" + help_topic="panel_my_picks_tab" + name="panel_picks" /> + </tab_container> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml index 686f4ac1d5..e00f654750 100644 --- a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml @@ -93,27 +93,19 @@ </text> <combo_box allow_text_entry="false" - bottom_delta="-20" - enabled="true" + bottom_delta="-20" follows="left|top" height="18" left="10" - max_chars="20" - mouse_opaque="true" + max_chars="20" name="controls" width="120"> <combo_item - type="string" - length="1" - enabled="true" name="Standard" value="Standard"> Standard </combo_item> <combo_item - type="string" - length="1" - enabled="true" name="Mini" value="Mini"> Mini diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml new file mode 100644 index 0000000000..fe3e010cf9 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml @@ -0,0 +1,429 @@ +<?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="313"> + <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="RegisterDateFormat"> + [REG_DATE] ([AGE]) + </string> + <scroll_container + color="DkGray2" + follows="all" + height="485" + layout="topleft" + name="profile_scroll" + reserve_scroll_corner="true" + opaque="true" + top="0" + width="313"> + <panel + name="scroll_content_panel" + follows="left|top|right" + height="485" + layout="topleft" + top="0" + left="0" + width="313"> + <panel + follows="left|top" + height="117" + layout="topleft" + left="10" + name="second_life_image_panel" + top="0" + width="280"> + <texture_picker + allow_no_texture="true" + default_image_name="None" + enabled="false" + follows="top|left" + height="117" + layout="topleft" + left="0" + name="2nd_life_pic" + top="10" + width="102" /> + <icon + height="102" + image_name="Blank" + layout="topleft" + name="2nd_life_edit_icon" + label="" + left="0" + tool_tip="Click the Edit Profile button below to change image" + 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="165" /> + <expandable_text + follows="left|top|right" + height="95" + layout="topleft" + left="107" + textbox.max_length="512" + name="sl_description_edit" + top_pad="-3" + width="173" + expanded_bg_visible="true" + expanded_bg_color="DkGray"> + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean 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. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. + </expandable_text> + </panel> + <panel + follows="left|top" + height="117" + layout="topleft" + top_pad="10" + left="10" + name="first_life_image_panel" + width="280"> + <texture_picker + allow_no_texture="true" + default_image_name="None" + enabled="false" + follows="top|left" + height="117" + layout="topleft" + left="0" + name="real_world_pic" + width="102" /> + <icon + height="102" + image_name="Blank" + layout="topleft" + name="real_world_edit_icon" + label="" + left="0" + tool_tip="Click the Edit Profile button below to change image" + top="4" + 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="165" /> + <expandable_text + follows="left|top|right" + height="95" + layout="topleft" + left="107" + textbox.max_length="512" + name="fl_description_edit" + top_pad="-3" + width="173" + 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> + + + <!-- <panel + name="lifes_images_panel" + follows="left|top|right" + height="244" + layout="topleft" + top="0" + left="0" + width="285"> + <panel + follows="left|top" + height="117" + layout="topleft" + left="10" + name="second_life_image_panel" + top="0" + width="285"> + <text + follows="left|top|right" + font.style="BOLD" + height="15" + layout="topleft" + left="0" + name="second_life_photo_title_text" + text_color="white" + value="[SECOND_LIFE]:" + width="170" /> + <texture_picker + allow_no_texture="true" + default_image_name="None" + enabled="false" + follows="top|left" + height="117" + layout="topleft" + left="0" + name="2nd_life_pic" + top_pad="0" + width="102" /> + </panel> + <icon + height="18" + image_name="AddItem_Off" + layout="topleft" + name="2nd_life_edit_icon" + label="" + left="87" + tool_tip="Click to select an image" + top="25" + width="18" /> + </panel> --> + + + + + <text + type="string" + follows="left|top" + font="SansSerifSmall" + font.style="BOLD" + height="15" + layout="topleft" + left="10" + name="me_homepage_text" + text_color="white" + top_pad="0" + width="280"> + Homepage: + </text> + <text + follows="left|top" + height="15" + layout="topleft" + left="10" + name="homepage_edit" + top_pad="0" + value="http://librarianavengers.org" + width="280" + 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="Member Since:" + width="280" /> + <text + follows="left|top" + height="15" + layout="topleft" + left="10" + name="register_date" + value="05/31/1976" + width="280" + 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="10" + value="Account Status:" + width="280" /> + <!-- <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 + follows="left|top" + height="20" + layout="topleft" + left="10" + name="acc_status_text" + top_pad="0" + value="Resident. No payment info on file." + width="280" + word_wrap="true" /> + <text + follows="left|top" + font.style="BOLD" + height="15" + layout="topleft" + left="10" + name="title_partner_text" + text_color="white" + top_pad="5" + value="Partner:" + width="280" /> + <panel + follows="left|top" + height="15" + layout="topleft" + left="10" + name="partner_data_panel" + top_pad="0" + width="280"> + <text + follows="left|top" + height="10" + layout="topleft" + left="0" + name="partner_text" + top="0" + value="[FIRST] [LAST]" + width="280" + word_wrap="true" /> + </panel> + <text + follows="left|top" + font.style="BOLD" + height="15" + layout="topleft" + left="10" + name="title_groups_text" + text_color="white" + top_pad="8" + value="Groups:" + width="280" /> + <expandable_text + follows="left|top|bottom" + height="60" + layout="topleft" + left="10" + name="sl_groups" + top_pad="0" + width="280" + 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> + </scroll_container> + <panel + follows="bottom|left" + layout="topleft" + left="0" + name="profile_buttons_panel" + top_pad="2" + bottom="10" + height="19" + width="303"> + <button + follows="bottom|left" + height="19" + label="Add Friend" + layout="topleft" + left="0" + mouse_opaque="false" + name="add_friend" + top="5" + width="75" /> + <button + follows="bottom|left" + height="19" + label="IM" + layout="topleft" + name="im" + top="5" + left_pad="5" + width="45" /> + <button + follows="bottom|left" + height="19" + label="Call" + layout="topleft" + name="call" + left_pad="5" + top="5" + width="45" /> + <button + enabled="false" + follows="bottom|left" + height="19" + label="Map" + layout="topleft" + name="show_on_map_btn" + top="5" + left_pad="5" + width="45" /> + <button + follows="bottom|left" + height="19" + label="Teleport" + layout="topleft" + name="teleport" + left_pad="5" + top="5" + width="80" /> + </panel> + <panel + follows="bottom|left" + layout="topleft" + left="0" + top_pad="-17" + name="profile_me_buttons_panel" + visible="false" + height="19" + width="303"> + <button + follows="bottom|right" + height="19" + left="10" + label="Edit Profile" + name="edit_profile_btn" + width="130" /> + <button + follows="bottom|right" + height="19" + label="Edit Appearance" + left_pad="10" + name="edit_appearance_btn" + right="-10" + width="130" /> + </panel> +</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 a90337d31a..9702bd41c8 100644 --- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml @@ -41,7 +41,6 @@ width="600"> <button follows="left|top" - font="SansSerifSmall" height="23" image_disabled="PushButton_Disabled" image_disabled_selected="PushButton_Disabled" @@ -58,7 +57,6 @@ <button follows="left|top" - font="SansSerifSmall" height="23" image_disabled="PushButton_Disabled" image_disabled_selected="PushButton_Disabled" @@ -74,7 +72,6 @@ width="31" /> <button follows="left|top" - font="SansSerifSmall" height="23" image_disabled="PushButton_Disabled" image_disabled_selected="PushButton_Disabled" @@ -156,7 +153,7 @@ layout="topleft" left="0" name="favorite" - image_drag_indication="Arrow_Down" + image_drag_indication="arrow_down.tga" chevron_button_tool_tip="Show more of My Favorites" bottom="62" width="590" /> diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml index a77094e942..de612fbbc3 100644 --- a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml @@ -23,10 +23,10 @@ layout="topleft" left_delta="7" left="0" - max_length="254" + max_length="512" name="chat_box" tool_tip="Press Enter to say, Ctrl+Enter to shout" - top="0" + top="1" width="279" /> <output_monitor auto_update="true" @@ -37,19 +37,21 @@ left_pad="-24" mouse_opaque="true" name="chat_zone_indicator" - top="4" + top="1" visible="true" width="20" /> <button follows="right" is_toggle="true" width="20" - top="0" + top="1" layout="topleft" - left_pad="4 " + left_pad="4" image_disabled="ComboButton_UpOff" image_unselected="ComboButton_UpOff" - image_selected="ComboButton_UpSelected" + image_selected="ComboButton_Up_On_Selected" + image_pressed="ComboButton_UpSelected" + image_pressed_selected="ComboButton_Up_On_Selected" height="23" name="show_nearby_chat" tool_tip="Shows/hides nearby chat log"> diff --git a/indra/newview/skins/default/xui/en/panel_notification.xml b/indra/newview/skins/default/xui/en/panel_notification.xml index 34a185fb44..df37f9973c 100644 --- a/indra/newview/skins/default/xui/en/panel_notification.xml +++ b/indra/newview/skins/default/xui/en/panel_notification.xml @@ -10,7 +10,7 @@ left="0" name="notification_panel" top="0" - height="10" + height="140" width="305"> <!-- THIS PANEL CONTROLS TOAST HEIGHT? --> <panel @@ -20,18 +20,18 @@ bg_alpha_color="0.3 0.3 0.3 0" bg_opaque_color="0.3 0.3 0.3 0" follows="left|right|top" - height="10" + height="100" label="info_panel" layout="topleft" left="0" name="info_panel" top="0" width="305"> - <!-- <text + <text border_visible="false" follows="left|right|top|bottom" font="SansSerif" - height="90" + height="85" layout="topleft" left="10" name="text_box" @@ -39,21 +39,21 @@ text_color="white" top="10" visible="false" - width="300" + width="285" wrap="true"/> <text border_visible="false" follows="left|right|top|bottom" font="SansSerifBold" - height="90" + height="85" layout="topleft" - left="45" + left="10" name="caution_text_box" text_color="1 0.82 0.46 1" - top="5" + top="10" visible="false" - width="300" - wrap="true"/> --> + width="285" + wrap="true"/> <text_editor h_pad="0" v_pad="0" @@ -63,6 +63,7 @@ enabled="false" follows="left|right|top|bottom" font="SansSerif" + height="85" layout="topleft" left="10" mouse_opaque="false" @@ -74,27 +75,19 @@ top="10" visible="false" width="285" - wrap="true"/> + wrap="true" + parse_highlights="true" + allow_html="true"/> </panel> <panel background_visible="false" follows="left|right|bottom" + height="40" label="control_panel" layout="topleft" left="0" left_delta="-38" name="control_panel" - top="20"> + top_pad="0"> </panel> - <!-- - <icon - follows="left|top" - height="32" - image_name="notify_tip_icon.tga" - layout="topleft" - left="8" - mouse_opaque="false" - name="info_icon" - top="20" - width="32" /> --> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml new file mode 100644 index 0000000000..d805209bf5 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml @@ -0,0 +1,112 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel name="Outfits" + bottom="0" + height="326" + left="0" + width="310" + border="true" + follows="left|top|right|bottom"> + <accordion + follows="left|top|right|bottom" + height="315" + layout="topleft" + left="0" + name="outfits_accordion" + top="2" + width="310"> + <accordion_tab + layout="topleft" + name="tab_outfits" + title="Outfits bar"> + <inventory_panel + allow_multi_select="true" + border="true" + bottom="0" + follows="left|top|right|bottom" + height="326" + left="0" + mouse_opaque="true" + name="outfitslist_accordionpanel" + width="310" + start_folder="My Outfits"/> + </accordion_tab> + <accordion_tab + layout="topleft" + name="tab_cof" + title="Current Outfit bar"> + <inventory_panel + allow_multi_select="true" + border="true" + bottom="0" + follows="left|top|right|bottom" + height="326" + left="0" + mouse_opaque="true" + name="cof_accordionpanel" + width="310" + start_folder="Current Outfit"/> + </accordion_tab> + </accordion> + + <button bottom="0" + halign="center" + height="16" + label=">" + enabled="false" + mouse_opaque="false" + name="selector" + width="20" + left="0" + visible="false" + follows="right|bottom" + tool_tip="View outfit properties"/> + <panel + background_visible="true" + bevel_style="none" + bottom="0" + follows="left|right|bottom" + height="30" + layout="bottomleft" + left="0" + visible="true" + name="bottom_panel" + width="310"> + <button + follows="bottom|left" + tool_tip="Show additional options" + height="18" + image_disabled="OptionsMenu_Disabled" + image_selected="OptionsMenu_Press" + image_unselected="OptionsMenu_Off" + layout="topleft" + left="10" + name="options_gear_btn" + picture_style="true" + top="6" + width="18" /> + <button + follows="bottom|left" + height="18" + image_selected="AddItem_Press" + image_unselected="AddItem_Off" + image_disabled="AddItem_Disabled" + layout="topleft" + left_pad="5" + name="add_btn" + picture_style="true" + tool_tip="Add new item" + width="18" /> + <dnd_button + follows="bottom|right" + height="18" + image_selected="TrashItem_Press" + image_unselected="TrashItem_Off" + layout="topleft" + right="-5" + name="trash_btn" + picture_style="true" + tool_tip="Remove selected item" + top="6" + width="18" /> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml new file mode 100644 index 0000000000..c8c79f8761 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu + bottom="806" + layout="topleft" + left="0" + mouse_opaque="false" + name="menu_gear_default" + visible="false"> + <menu_item_call + label="New Outfit" + layout="topleft" + name="new"> + <on_click + function="panel_outfits_inventory_gear_default.Custom.Action" + parameter="new" /> + <on_enable + function="panel_outfits_inventory_gear_default.Enable" + parameter="new" /> + </menu_item_call> + <menu_item_call + label="Wear Outfit" + layout="topleft" + name="wear"> + <on_click + function="panel_outfits_inventory_gear_default.Custom.Action" + parameter="wear" /> + <on_enable + function="panel_outfits_inventory_gear_default.Enable" + parameter="wear" /> + </menu_item_call> + <menu_item_call + label="Delete Outfit" + layout="topleft" + name="delete"> + <on_click + function="panel_outfits_inventory_gear_default.Custom.Action" + parameter="delete" /> + <on_enable + function="panel_outfits_inventory_gear_default.Enable" + parameter="delete" /> + </menu_item_call> +</menu> diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index 9fac7d34f7..87861e7901 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -107,7 +107,10 @@ background_visible="true" name="add_friend_btn" top_delta="0" tool_tip="Add selected resident to your friends List" - width="18" /> + width="18"> + <commit_callback + function="People.addFriend" /> + </button> </panel> </panel> <panel @@ -325,7 +328,10 @@ background_visible="true" name="add_friend_btn" top_delta="0" tool_tip="Add selected resident to your friends List" - width="18" /> + width="18"> + <commit_callback + function="People.addFriend" /> + </button> </panel> </panel> </tab_container> @@ -338,7 +344,6 @@ background_visible="true" width="313"> <button follows="bottom|left" - font="SansSerifSmall" top="4" left="0" height="19" @@ -349,7 +354,6 @@ background_visible="true" width="70" /> <button follows="bottom|left" - font="SansSerifSmall" top="4" left_pad="2" height="19" @@ -360,7 +364,6 @@ background_visible="true" width="45" /> <button follows="bottom|left" - font="SansSerifSmall" top="4" left_pad="2" height="19" @@ -371,7 +374,6 @@ background_visible="true" width="50" /> <button follows="left|top" - font="SansSerifSmall" top="4" left_pad="2" height="19" @@ -381,7 +383,6 @@ background_visible="true" width="60" /> <button follows="bottom|left" - font="SansSerifSmall" top="4" left_pad="2" height="19" @@ -392,7 +393,6 @@ background_visible="true" width="75" /> <button follows="bottom|left" - font="SansSerifSmall" top="4" left="0" height="19" @@ -403,7 +403,6 @@ background_visible="true" width="110" /> <button follows="bottom|left" - font="SansSerifSmall" top="4" left_pad="2" height="19" 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 cf18aa2d39..0cf2a7afc3 100644 --- a/indra/newview/skins/default/xui/en/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml @@ -103,7 +103,6 @@ name="buttons"> <button follows="bottom|left" - font="SansSerifSmall" height="19" label="Teleport" layout="topleft" @@ -113,7 +112,6 @@ width="90" /> <button follows="bottom|left" - font="SansSerifSmall" height="19" label="Map" layout="topleft" @@ -123,7 +121,6 @@ width="90" /> <button follows="bottom|left" - font="SansSerifSmall" height="19" label="Edit" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml index 7ff227ecb6..023b1fc81d 100644 --- a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml @@ -12,24 +12,24 @@ follows="all" height="85" image_name="ListItem_Over" - right="-3" + right="-2" mouse_opaque="false" name="hovered_icon" top="1" scale_image="true" visible="false" - width="307"/> + width="308" /> <icon follows="all" height="85" image_name="ListItem_Select" - right="-3" + right="-2" mouse_opaque="false" name="selected_icon" top="1" scale_image="true" visible="false" - width="307"/> + width="308" /> <texture_picker allow_no_texture="true" border_enabled="true" @@ -47,36 +47,34 @@ width="90" /> <text follows="top|left|right" - font="SansSerifSmallBold" - height="16" + font="SansSerifSmall" + height="15" layout="topleft" left="110" name="picture_name" text_color="white" top="9" - use_ellipses="false" - width="197" + use_ellipses="true" + width="193" word_wrap="false" /> <expandable_text follows="top|left|right" font="SansSerifSmall" - height="40" + height="55" layout="topleft" - left="110" + left="103" name="picture_descr" - top_pad="3" + top_pad="0" width="178" word_wrap="true" /> - <button - follows="top|right" - height="16" - image_selected="BuyArrow_Press" - image_pressed="BuyArrow_Press" - image_unselected="BuyArrow_Press" + <button + follows="right" + height="20" + image_overlay="ForwardArrow_Off" layout="topleft" + left_pad="5" + right="-8" name="info_chevron" - right="-7" - tab_stop="false" - top="27" - width="16" /> + top_delta="15" + width="20" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml index 9cfbed432a..4f0d155876 100644 --- a/indra/newview/skins/default/xui/en/panel_picks.xml +++ b/indra/newview/skins/default/xui/en/panel_picks.xml @@ -14,8 +14,20 @@ <string name="no_classifieds" value="No Classifieds" /> - + <text + type="string" + follows="all" + height="535" + layout="topleft" + left="6" + name="empty_picks_panel_text" + top="10" + visible="false" + width="313"> + There are no picks/classifieds here + </text> <accordion + fit_parent="true" follows="all" height="465" layout="topleft" @@ -120,7 +132,6 @@ <button enabled="false" follows="bottom|left" - font="SansSerifSmallBold" height="25" label="Info" layout="topleft" @@ -132,7 +143,6 @@ <button enabled="false" follows="bottom|left" - font="SansSerifSmallBold" height="25" label="Teleport" layout="topleft" @@ -144,7 +154,6 @@ <button enabled="false" follows="bottom|left" - font="SansSerifSmallBold" height="25" label="Map" layout="topleft" @@ -156,7 +165,6 @@ <button enabled="false" follows="bottom|right" - font="SansSerifSmallBold" height="25" label="▼" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml index e6084202d7..9ab5c6b4f7 100644 --- a/indra/newview/skins/default/xui/en/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml @@ -172,7 +172,7 @@ width="313"> <panel bg_alpha_color="DkGray2" - follows="all" + follows="left|top|right" height="533" layout="topleft" left="0" @@ -192,7 +192,7 @@ <layout_stack border_size="0" clip="false" - follows="all" + follows="left|top|right" height="50" layout="topleft" mouse_opaque="false" @@ -305,7 +305,7 @@ top_delta="0" width="18" /> <text - follows="right|top" + follows="left|top|right" height="16" layout="topleft" left_pad="8" diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml index 5efacb68be..88df529ec1 100644 --- a/indra/newview/skins/default/xui/en/panel_places.xml +++ b/indra/newview/skins/default/xui/en/panel_places.xml @@ -72,7 +72,6 @@ background_visible="true" width="313"> <button follows="bottom|left" - font="SansSerifSmall" height="19" label="Teleport" layout="topleft" @@ -82,7 +81,6 @@ background_visible="true" width="100" /> <button follows="bottom|left" - font="SansSerifSmall" height="19" label="Map" layout="topleft" @@ -92,7 +90,6 @@ background_visible="true" width="70" /> <button follows="bottom|left" - font="SansSerifSmall" height="19" label="Edit" layout="topleft" @@ -102,7 +99,6 @@ background_visible="true" width="70" /> <button follows="bottom|right" - font="SansSerifSmall" height="19" image_disabled="ForwardArrow_Off" image_selected="ForwardArrow_Press" @@ -114,7 +110,6 @@ background_visible="true" width="18" /> <button follows="bottom|right" - font="SansSerifSmall" height="19" label="Close" layout="topleft" @@ -124,7 +119,6 @@ background_visible="true" width="60" /> <button follows="bottom|right" - font="SansSerifSmall" height="19" label="Cancel" layout="topleft" @@ -134,7 +128,6 @@ background_visible="true" width="60" /> <button follows="bottom|right" - font="SansSerifSmall" height="19" label="Save" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml index 0ac0521b10..6a61953319 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml @@ -319,7 +319,6 @@ Avatars: bottom_delta="0" enabled_control="EnableVoiceChat" follows="left" - font="SansSerif" halign="center" height="20" label="Middle Mouse Button" 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 5a4b0a3892..fac0d5c60f 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml @@ -309,4 +309,13 @@ name="send_im_to_email" top_pad="5" width="400" /> + <check_box + enabled="false" + height="16" + label="Enable plain text chat history" + layout="topleft" + left_delta="0" + name="plain_text_chat_history" + top_pad="5" + width="400" /> </panel> 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 a6ca73d4b7..6bb937e3c6 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml @@ -66,11 +66,7 @@ label="Italiano (Italian) - Beta" name="Italian" value="it" /> - <combo_box.item - enabled="true" - label="Magyar (Hungarian) - Beta" - name="Hungarian" - value="hu" /> + <combo_box.item enabled="true" label="Nederlands (Dutch) - Beta" @@ -86,36 +82,16 @@ label="Portugués (Portuguese) - Beta" name="Portugese" 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="Українська (Ukrainian) - Beta" - name="Ukrainian" - value="uk" /> - <combo_box.item - enabled="true" - label="中文 (简体) (Chinese) - Beta" - name="Chinese" - value="zh" /> + + + + <combo_box.item enabled="true" label="日本語 (Japanese) - Beta" name="(Japanese)" value="ja" /> - <combo_box.item - enabled="true" - label="한국어 (Korean) - Beta" - name="(Korean)" - value="ko" /> + <combo_box.item enabled="true" label="Test Language" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml index 9b10edde33..eb00b9b79a 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -16,81 +16,8 @@ height="12" layout="topleft" left="30" - name="WindowSizeLabel" - top="10" - width="300"> - Window size: - </text> - <check_box - control_name="WindowFullScreen" - height="16" - label="Use fullscreen" - layout="topleft" - left_delta="50" - name="windowed mode" - top_pad="4" - width="175"> - </check_box> - <combo_box - visiblity_control="WindowFullScreen" - allow_text_entry="false" - enabled="true" - layout="topleft" - height="18" - left_delta="220" - max_chars="20" - mouse_opaque="true" - name="windowsize combo" - top_delta="-1" - width="150"> - <combo_box.item - type="string" - length="1" - enabled="true" - name="640x480" - value="640 x 480" - label="640x480"/> - <combo_box.item - type="string" - length="1" - enabled="true" - name="800x600" - value="800 x 600" - label="800x600"/> - <combo_box.item - type="string" - length="1" - enabled="true" - name="720x480" - value="720 x 480" - label="720x480 (NTSC)"/> - <combo_box.item - type="string" - length="1" - enabled="true" - name="768x576" - value="768 x 576" - label="768x576 (PAL)"/> - <combo_box.item - type="string" - length="1" - enabled="true" - name="1024x768" - value="1024 x 768" - label="1024x768"/> - <combo_box.commit_callback - function="Pref.setControlFalse" - parameter="FullScreenAutoDetectAspectRatio" /> - </combo_box> - <text - type="string" - length="1" - follows="left|top" - height="12" - layout="topleft" - left="30" name="UI Size:" - top_pad="4" + top="10" width="300"> UI size: </text> @@ -101,7 +28,7 @@ follows="left|top" height="15" increment="0.025" - initial_value="1" + initial_valu="1" layout="topleft" left_delta="52" max_val="1.4" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml index 8c22a5e483..23832ba120 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml @@ -86,7 +86,16 @@ name="autoplay_enabled" top_pad="10" width="350" /> - <text + <check_box + control_name="ParcelMediaAutoPlayEnable" + height="16" + label="Automatically Play Parcel Media" + layout="topleft" + left="30" + name="parcel_autoplay_enabled" + top_pad="10" + width="350" /> + <text type="string" length="1" follows="left|top" @@ -100,61 +109,27 @@ Logs: </text> <check_box - + enabled="false" + control_name="LogChat" + height="16" + label="Save nearby chat logs on my computer" + layout="topleft" + left="30" + name="log_nearby_chat" + top_pad="10" + width="350"> + </check_box> + <check_box enabled="false" control_name="LogInstantMessages" height="16" - label="Save logs on my computer" + label="Save IM logs on my computer" layout="topleft" left="30" name="log_instant_messages" top_pad="10" width="350"> - <check_box.commit_callback - function="Pref.Logging" /> </check_box> - <radio_group - control_name="IMLogOptions" - enabled="false" - height="80" - layout="topleft" - left_delta="50" - name="ChatIMLogs" - width="350" - top_pad="0"> - <radio_item - height="16" - label="Chat" - layout="topleft" - left="0" - name="radio1" - top="3" - width="200" /> - <radio_item - height="16" - label="IM" - layout="topleft" - left_delta="0" - name="radio2" - top_pad="3" - width="200" /> - <radio_item - height="16" - label="Both, together" - layout="topleft" - left_delta="0" - name="radio3" - top_pad="3" - width="200" /> - <radio_item - height="16" - label="Both, separate" - layout="topleft" - left_delta="0" - name="radio4" - top_pad="3" - width="200" /> - </radio_group> <check_box control_name="LogTimestamp" enabled="false" 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 9cf0bd26d8..5cabae5fa0 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml @@ -169,12 +169,12 @@ decimal_digits="0" follows="left|top" height="15" - increment="10" - initial_value="50" + increment="16" + initial_value="512" layout="topleft" left_delta="150" - max_val="1000" - min_val="10" + max_val="1024" + min_val="32" name="cache_size" top_delta="-1" width="180" /> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml index d454b9e5c8..8ef2cdfc37 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml @@ -350,7 +350,7 @@ border="false" follows="top|left" height="145" - label="DeviceSettings" + label="Device Settings" layout="topleft" left="0" name="device_settings_panel" diff --git a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml index 3bdd7114ee..af4c01185a 100644 --- a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml @@ -2,58 +2,21 @@ <panel follows="left|right|top|bottom" name="MediaControls" - bg_alpha_color="1 1 1 0" - height="160" + background_visible="false" + height="192" layout="topleft" mouse_opaque="false" width="800"> + <string name="control_background_image_name">Inspector_Background</string> + <string name="skip_step">0.2</string> <panel name="media_region" bottom="125" follows="left|right|top|bottom" layout="topleft" - left="20" mouse_opaque="false" - right="-20" top="20" /> <layout_stack - follows="left|right|bottom" - height="32" - layout="topleft" - animate="false" - left="0" - orientation="horizontal" - top="96"> - <!-- outer layout_panels center the inner one --> - <layout_panel - width="0" - layout="topleft" - user_resize="false" /> - <panel - name="media_progress_indicator" - height="22" - layout="topleft" - left="0" - top="0" - auto_resize="false" - user_resize="false" - min_width="100" - width="200"> - <progress_bar - name="media_progress_bar" - color_bar="1 1 1 0.96" - follows="left|right|top" - height="16" - layout="topleft" - left="0" - tool_tip="Media is Loading"/> - </panel> - <layout_panel - width="0" - layout="topleft" - user_resize="false" /> - </layout_stack> - <layout_stack name="media_controls" follows="left|right" animate="false" @@ -64,6 +27,7 @@ top="128"> <!-- outer layout_panels center the inner one --> <layout_panel + name="left_bookend" width="0" layout="topleft" user_resize="false" /> @@ -76,13 +40,18 @@ width="22" top="4"> <button + image_overlay="Arrow_Left_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" auto_resize="false" height="22" - image_selected="media_btn_back.png" - image_unselected="media_btn_back.png" layout="topleft" - tool_tip="Step back" + tool_tip="Navigate back" width="22" + left="0" top_delta="4"> <button.commit_callback function="MediaCtrl.Back" /> @@ -94,37 +63,25 @@ user_resize="false" layout="topleft" top="10" - min_width="17" - width="17"> + min_width="22" + width="22"> <button + image_overlay="Arrow_Right_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" height="22" - image_selected="media_btn_forward.png" - image_unselected="media_btn_forward.png" layout="topleft" - tool_tip="Step forward" + tool_tip="Navigate forward" top_delta="0" - min_width="17" - width="17"> + min_width="22" + width="22"> <button.commit_callback function="MediaCtrl.Forward" /> </button> </layout_panel> -<!-- - <panel - height="22" - layout="topleft" - auto_resize="false" - min_width="3" - width="3"> - <icon - height="22" - image_name="media_panel_divider.png" - layout="topleft" - top="0" - min_width="3" - width="3" /> - </panel> ---> <layout_panel name="home" auto_resize="false" @@ -134,11 +91,15 @@ min_width="22" width="22"> <button - height="22" - image_selected="media_btn_home.png" - image_unselected="media_btn_home.png" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_overlay="Home_Off" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" layout="topleft" tool_tip="Home page" + height="22" min_width="22" width="22"> <button.commit_callback @@ -154,33 +115,21 @@ min_width="22" width="22"> <button + image_overlay="Stop_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" height="22" - image_selected="button_anim_stop.tga" - image_unselected="button_anim_stop.tga" layout="topleft" tool_tip="Stop media" min_width="22" width="22"> <button.commit_callback - function="MediaCtrl.Stop" /> + function="MediaCtrl.MediaStop" /> </button> </layout_panel> -<!-- - <panel - height="22" - layout="topleft" - auto_resize="false" - min_width="3" - width="3"> - <icon - height="22" - image_name="media_panel_divider.png" - layout="topleft" - top="0" - min_width="3" - width="3" /> - </panel> ---> <layout_panel name="reload" auto_resize="false" @@ -191,8 +140,12 @@ width="22"> <button height="22" - image_selected="media_btn_reload.png" - image_unselected="media_btn_reload.png" + image_overlay="Refresh_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" layout="topleft" tool_tip="Reload" min_width="22" @@ -211,8 +164,12 @@ width="22"> <button height="22" - image_selected="media_btn_stoploading.png" - image_unselected="media_btn_stoploading.png" + image_overlay="StopReload_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" layout="topleft" tool_tip = "Stop loading" min_width="22" @@ -230,11 +187,15 @@ min_width="22" width="22"> <button - height="22" - image_selected="button_anim_play.tga" - image_unselected="button_anim_play.tga" + image_overlay="Play_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" layout="topleft" tool_tip = "Play media" + height="22" min_width="22" width="22"> <button.commit_callback @@ -250,10 +211,14 @@ min_width="22" width="22"> <button - height="22" - image_selected="button_anim_pause.tga" - image_unselected="button_anim_pause.tga" + image_overlay="Pause_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" layout="topleft" + height="22" tool_tip = "Pause media"> <button.commit_callback function="MediaCtrl.Pause" /> @@ -264,7 +229,7 @@ name="media_address" auto_resize="true" user_resize="false" - height="22" + height="24" follows="left|right|bottom" layout="topleft" width="190" @@ -294,31 +259,43 @@ function="MediaCtrl.CommitURL" /> function="MediaCtrl.CommitURL"/> </line_editor> <layout_stack + name="media_address_url_icons" animate="false" follows="right" - width="32" - min_width="32" - height="16" - top="3" - orientation="horizontal" - left_pad="-38"> - <icon - name="media_whitelist_flag" - follows="top|right" - height="16" - image_name="smicon_warn.tga" + height="20" + width="38" + right="-2" + top="-1" + orientation="horizontal"> + <layout_panel layout="topleft" - tool_tip="White List enabled" - min_width="16" - width="16" /> - <icon - name="media_secure_lock_flag" - height="16" - image_name="inv_item_eyes.tga" + width="16" + auto_resize="false" + user_resize="false"> + <icon + name="media_whitelist_flag" + follows="top|right" + height="16" + image_name="Flag" + layout="topleft" + tool_tip="White List enabled" + min_width="16" + width="16" /> + </layout_panel> + <layout_panel layout="topleft" - tool_tip="Secured Browsing" - min_width="16" - width="16" /> + width="16" + auto_resize="false" + user_resize="false"> + <icon + name="media_secure_lock_flag" + height="16" + image_name="Lock2" + layout="topleft" + tool_tip="Secured Browsing" + min_width="16" + width="16" /> + </layout_panel> </layout_stack> </layout_panel> <layout_panel @@ -337,6 +314,7 @@ function="MediaCtrl.CommitURL" /> initial_value="0.5" layout="topleft" tool_tip="Movie play progress" + top="8" min_width="100" width="200"> <slider_bar.commit_callback @@ -344,47 +322,108 @@ function="MediaCtrl.CommitURL" /> </slider_bar> </layout_panel> <layout_panel + name="skip_back" + auto_resize="false" + user_resize="false" + layout="topleft" + min_width="22" + width="22"> + <button + image_overlay="SkipBackward_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" + auto_resize="false" + height="22" + layout="topleft" + tool_tip="Step back" + top="-14" + width="22" + left="0"> + <button.commit_callback + function="MediaCtrl.SkipBack" /> + </button> + </layout_panel> + <layout_panel + name="skip_forward" + auto_resize="false" + user_resize="false" + layout="topleft" + min_width="22" + width="22"> + <button + image_overlay="SkipForward_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" + height="22" + layout="topleft" + tool_tip="Step forward" + top="-14" + min_width="22" + width="22"> + <button.commit_callback + function="MediaCtrl.SkipForward" /> + </button> + </layout_panel> + <layout_panel name="media_volume" auto_resize="false" user_resize="false" layout="topleft" - height="24" - min_width="24" - width="24"> + height="22" + min_width="22" + width="22"> + <!-- Note: this is not quite right either...the mute button is not the --> + <!-- same as the others because it cannot have the "image_overlay" be --> + <!-- two different images. --> <button + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="AudioMute_Off" + image_unselected="Audio_Off" + hover_glow_amount="0.15" name="media_volume_button" height="22" - image_selected="icn_speaker-muted_dark.tga" - image_unselected="icn_speaker_dark.tga" is_toggle="true" layout="topleft" scale_image="false" tool_tip="Mute This Media" - top_delta="22" - min_width="24" - width="24" > + top_delta="18" + min_width="22" + width="22" > <button.commit_callback function="MediaCtrl.ToggleMute" /> </button> </layout_panel> + <!-- We do not have a design yet for "volume", so this is a temporary --> + <!-- solution. See DEV-42827. --> <layout_panel name="volume_up" auto_resize="false" user_resize="false" layout="topleft" - min_width="20" + min_width="14" height="14" - width="20"> + width="14"> <button - top="-3" + image_overlay="media_btn_scrollup.png" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" + top="-5" height="14" - image_selected="media_btn_scrollup.png" - image_unselected="media_btn_scrollup.png" layout="topleft" tool_tip="Volume up" scale_image="true" - min_width="20" - width="20" > + min_width="14" + width="14" > <button.commit_callback function="MediaCtrl.CommitVolumeUp" /> </button> @@ -394,26 +433,32 @@ function="MediaCtrl.CommitURL" /> auto_resize="false" user_resize="false" layout="topleft" - min_width="20" + min_width="14" height="14" - width="20"> + width="14"> <button - top="-5" - height="14" - image_selected="media_btn_scrolldown.png" - image_unselected="media_btn_scrolldown.png" + image_overlay="media_btn_scrolldown.png" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" layout="topleft" tool_tip="Volume down" scale_image="true" - min_width="20" - width="20"> + top="-5" + height="14" + min_width="14" + width="14"> <button.commit_callback function="MediaCtrl.CommitVolumeDown" /> </button> </layout_panel> <!-- Scroll pad --> -<!-- -disabled + <!-- This was removed from the design, but is still here because it is --> + <!-- complex, and recreating it would be hard. In case the design --> + <!-- changes, here it lies: --> + <!-- <layout_panel name="media_panel_scroll" auto_resize="false" @@ -479,8 +524,21 @@ disabled min_width="8" width="8" /> </layout_panel> -disabled ---> + --> + <panel + height="28" + layout="topleft" + auto_resize="false" + min_width="3" + width="3"> + <icon + height="26" + image_name="media_panel_divider.png" + layout="topleft" + top="0" + min_width="3" + width="3" /> + </panel> <layout_panel name="zoom_frame" auto_resize="false" @@ -490,9 +548,13 @@ disabled min_width="22" width="22"> <button + image_overlay="Zoom_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" height="22" - image_selected="media_btn_optimalzoom.png" - image_unselected="media_btn_optimalzoom.png" layout="topleft" tool_tip="Zoom into media" min_width="22" @@ -509,9 +571,13 @@ disabled min_width="21" width="21" > <button + image_overlay="UnZoom_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" height="22" - image_selected="media_btn_done.png" - image_unselected="media_btn_done.png" layout="topleft" tool_tip ="Zoom Back" top_delta="-4" @@ -520,22 +586,6 @@ disabled function="MediaCtrl.Close" /> </button> </layout_panel> -<!-- - <panel - height="22" - layout="topleft" - auto_resize="false" - min_width="3" - width="3"> - <icon - height="22" - image_name="media_panel_divider.png" - layout="topleft" - top="0" - min_width="3" - width="3" /> - </panel> ---> <layout_panel name="new_window" auto_resize="false" @@ -544,34 +594,61 @@ disabled min_width="22" width="22"> <button + image_overlay="ExternalBrowser_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" height="22" - image_selected="media_btn_newwindow.png" - image_unselected="media_btn_newwindow.png" layout="topleft" tool_tip = "Open URL in browser" - top_delta="-3" + top_delta="-4" min_width="24" width="24" > <button.commit_callback function="MediaCtrl.Open" /> </button> </layout_panel> -<!-- + <!-- bookend panel --> + <layout_panel + name="right_bookend" + width="0" + layout="topleft" + user_resize="false" /> + </layout_stack> + <layout_stack + follows="left|right|bottom" + height="32" + layout="topleft" + animate="false" + left="0" + orientation="horizontal" + top="150"> + <!-- outer layout_panels center the inner one --> + <layout_panel + width="0" + layout="topleft" + user_resize="false" /> <panel + name="media_progress_indicator" height="22" layout="topleft" + left="0" + top="0" auto_resize="false" - min_width="3" - width="3"> - <icon - height="22" - image_name="media_panel_divider.png" + user_resize="false" + min_width="100" + width="200"> + <progress_bar + name="media_progress_bar" + color_bar="1 1 1 0.96" + follows="left|right|top" + height="8" layout="topleft" - top="0" - min_width="3" - width="3" /> + left="0" + tool_tip="Media is Loading"/> </panel> ---> <layout_panel width="0" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml index 0f5e96416d..947bb67152 100644 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_profile.xml @@ -27,7 +27,11 @@ <string name="no_partner_text" value="None" /> - <scroll_container + <string + name="RegisterDateFormat"> + [REG_DATE] ([AGE]) + </string> + <scroll_container color="DkGray2" follows="all" height="485" @@ -283,7 +287,7 @@ mouse_opaque="false" name="add_friend" top="5" - width="75" /> + width="76" /> <button follows="bottom|left" height="19" @@ -292,7 +296,7 @@ name="im" top="5" left_pad="5" - width="45" /> + width="31" /> <button follows="bottom|left" height="19" @@ -301,7 +305,7 @@ name="call" left_pad="5" top="5" - width="45" /> + width="40" /> <button enabled="false" follows="bottom|left" @@ -311,7 +315,7 @@ name="show_on_map_btn" top="5" left_pad="5" - width="45" /> + width="42" /> <button follows="bottom|left" height="19" @@ -320,7 +324,16 @@ name="teleport" left_pad="5" top="5" - width="80" /> + width="64" /> + <button + follows="bottom|right" + height="19" + label="▼" + layout="topleft" + name="overflow_btn" + right="-1" + top="5" + width="21" /> </panel> <panel follows="bottom|left" @@ -333,7 +346,6 @@ width="303"> <button follows="bottom|right" - font="SansSerifSmall" height="19" left="10" label="Edit Profile" diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml index b015346a79..8e683bffc1 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_view.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml @@ -25,10 +25,11 @@ tab_stop="false" top="2" width="23" /> - <text + <text_editor + read_only = "true" follows="top|left|right" font="SansSerifHugeBold" - height="26" + height="29" layout="topleft" left_pad="10" name="user_name" @@ -52,7 +53,7 @@ halign="center" layout="topleft" left="10" - min_width="333" + min_width="333" name="tabs" tab_min_width="80" tab_height="30" 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 49fc930cd8..75d7d85505 100644 --- a/indra/newview/skins/default/xui/en/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/en/panel_region_covenant.xml @@ -119,7 +119,6 @@ </text_editor> <button follows="left|top" - font="SansSerifSmall" height="18" label="Reset" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_region_debug.xml b/indra/newview/skins/default/xui/en/panel_region_debug.xml index a1bca4229d..e07585d285 100644 --- a/indra/newview/skins/default/xui/en/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/en/panel_region_debug.xml @@ -61,7 +61,6 @@ <button enabled="false" follows="left|top" - font="SansSerifSmall" height="20" label="Apply" layout="topleft" @@ -109,7 +108,6 @@ <button follows="left|top" height="20" - font="SansSerifSmall" label="Choose" layout="topleft" left_pad="5" @@ -156,7 +154,6 @@ <button follows="left|top" height="20" - font="SansSerifSmall" label="Return" layout="topleft" left="20" @@ -165,7 +162,6 @@ width="80" /> <button follows="left|top" - font="SansSerifSmall" height="20" label="Get Top Colliders..." layout="topleft" @@ -176,7 +172,6 @@ width="150" /> <button follows="left|top" - font="SansSerifSmall" height="20" label="Get Top Scripts..." layout="topleft" @@ -187,7 +182,6 @@ width="150" /> <button follows="left|top" - font="SansSerifSmall" height="20" label="Restart Region" layout="topleft" @@ -198,7 +192,6 @@ width="130" /> <button follows="left|top" - font="SansSerifSmall" height="20" label="Delay Restart" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml index add1476179..e25ff0d548 100644 --- a/indra/newview/skins/default/xui/en/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml @@ -81,7 +81,7 @@ regions in the estate. <view_border bevel_style="in" follows="top|left" - height="290" + height="310" layout="topleft" left_delta="-4" top_pad="5" @@ -185,48 +185,48 @@ regions in the estate. follows="left|top" height="20" layout="topleft" - left="10" + left="15" name="abuse_email_text" - top_pad="5" + top_pad="10" width="180"> Abuse email address: </text> <line_editor follows="top|left" - height="19" + height="23" layout="topleft" left="15" name="abuse_email_address" - top_pad="5" - width="205" /> + top_pad="-5" + width="230" /> <button enabled="false" follows="left|top" - height="20" + height="23" label="Apply" layout="topleft" name="apply_btn" - right="250" - top_pad="4" - width="90" /> + top_pad="10" + left="78" + width="97" /> <button follows="left|top" - height="20" + height="23" label="Send Message To Estate..." layout="topleft" - left="8" + left="50" name="message_estate_btn" - top_pad="5" - width="250" /> + top_pad="20" + width="160" /> <button follows="left|top" - height="20" + height="23" label="Kick User from Estate..." layout="topleft" - left="8" + left="50" name="kick_user_from_estate_btn" top_pad="5" - width="250" /> + width="160" /> <text type="string" @@ -243,14 +243,14 @@ regions in the estate. <view_border bevel_style="none" follows="top|left" - height="60" + height="71" layout="topleft" right="470" - top_pad="5" + top_pad="-5" width="200" /> <name_list follows="left|top" - height="60" + height="71" layout="topleft" left_delta="0" multi_select="true" @@ -259,22 +259,22 @@ regions in the estate. width="200" /> <button follows="left|top" - height="20" + height="23" label="Remove..." layout="topleft" name="remove_estate_manager_btn" right="470" top_pad="5" - width="90" /> + width="97" /> <button follows="left|top" - height="20" + height="23" label="Add..." layout="topleft" - left_delta="-110" + left_delta="-103" name="add_estate_manager_btn" top_delta="0" - width="90" /> + width="97" /> <text type="string" length="1" @@ -283,21 +283,21 @@ regions in the estate. layout="topleft" left_delta="0" name="allow_resident_label" - top_pad="5" + top_pad="10" width="200"> Allowed Residents: </text> <view_border bevel_style="none" follows="top|left" - height="60" + height="71" layout="topleft" right="470" - top_pad="5" + top_pad="-5" width="200" /> <name_list follows="left|top" - height="60" + height="71" layout="topleft" left_delta="0" multi_select="true" @@ -306,22 +306,22 @@ regions in the estate. width="200" /> <button follows="left|top" - height="20" + height="23" label="Remove..." layout="topleft" name="remove_allowed_avatar_btn" right="470" top_pad="5" - width="90" /> + width="97" /> <button follows="left|top" - height="20" + height="23" label="Add..." layout="topleft" - left_delta="-110" + left_delta="-103" name="add_allowed_avatar_btn" top_delta="0" - width="90" /> + width="97" /> <text type="string" length="1" @@ -330,21 +330,21 @@ regions in the estate. layout="topleft" left_delta="0" name="allow_group_label" - top_pad="5" + top_pad="10" width="200"> Allowed Groups: </text> <view_border bevel_style="none" follows="top|left" - height="60" + height="71" layout="topleft" right="470" - top_pad="5" + top_pad="-5" width="200" /> <name_list follows="left|top" - height="60" + height="71" layout="topleft" left_delta="0" multi_select="true" @@ -353,22 +353,22 @@ regions in the estate. width="200" /> <button follows="left|top" - height="20" + height="23" label="Remove..." layout="topleft" name="remove_allowed_group_btn" right="470" top_pad="5" - width="90" /> + width="97" /> <button follows="left|top" - height="20" + height="23" label="Add..." layout="topleft" - left_delta="-110" + left_delta="-103" name="add_allowed_group_btn" top_delta="0" - width="90" /> + width="97" /> <text type="string" length="1" @@ -377,21 +377,21 @@ regions in the estate. layout="topleft" left_delta="0" name="ban_resident_label" - top_pad="5" + top_pad="10" width="200"> Banned Residents: </text> <view_border bevel_style="none" follows="top|left" - height="60" + height="71" layout="topleft" right="470" - top_pad="5" + top_pad="-5" width="200" /> <name_list follows="left|top" - height="60" + height="71" layout="topleft" left_delta="0" multi_select="true" @@ -400,20 +400,20 @@ regions in the estate. width="200" /> <button follows="left|top" - height="20" + height="23" label="Remove..." layout="topleft" name="remove_banned_avatar_btn" right="470" top_pad="5" - width="90" /> + width="97" /> <button follows="left|top" - height="20" + height="23" label="Add..." layout="topleft" - left_delta="-110" + left_delta="-103" name="add_banned_avatar_btn" top_delta="0" - width="90" /> + width="97" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml index a419a02d75..95242a9639 100644 --- a/indra/newview/skins/default/xui/en/panel_side_tray.xml +++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml @@ -102,9 +102,9 @@ background_visible="true" > <panel - class="panel_me_profile_view" - name="panel_me_profile" - filename="panel_me_profile.xml" + class="panel_me" + name="panel_me" + filename="panel_me.xml" label="Me" /> </sidetray_tab> @@ -120,9 +120,9 @@ background_visible="true" > <panel - class="panel_appearance" - name="panel_appearance" - filename="panel_appearance.xml" + class="sidepanel_appearance" + name="sidepanel_appearance" + filename="sidepanel_appearance.xml" label="Edit Appearance" font="SansSerifBold" /> diff --git a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml index 566fc95230..9839075862 100644 --- a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml +++ b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml @@ -7,6 +7,24 @@ layout="topleft" name="home_tab" width="333"> + <scroll_container + color="DkGray" + follows="all" + layout="topleft" + left="0" + name="profile_scroll" + opaque="true" + height="560" + width="333" + top="0"> + <panel + background_visible="true" + height="560" + layout="topleft" + name="profile_scroll_panel" + top="0" + left="0" + width="311"> <panel background_visible="true" bg_alpha_color="DkGray2" @@ -242,4 +260,6 @@ Browse your inventory. </text> </panel> + </panel> + </scroll_container> </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 8fc78c6701..9c66653e3c 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -43,43 +43,55 @@ auto_resize="true" halign="right" follows="right|bottom" - font="SansSerifSmall" image_selected="BuyArrow_Over" image_unselected="BuyArrow_Off" image_pressed="BuyArrow_Press" height="16" - left="-245" + left="-200" name="buycurrency" - pad_right="22px" + pad_right="20px" tool_tip="My Balance: Click to buy more L$" top="1" - width="117" /> - <button - follows="right|bottom" - height="16" - image_selected="parcel_drk_VoiceNo" - image_unselected="parcel_drk_Voice" - is_toggle="true" - left_pad="15" - top="1" - name="volume_btn" - width="16" /> + width="90" /> <text type="string" length="1" + font="SansSerifSmall" text_readonly_color="TimeTextColor" follows="right|bottom" halign="right" height="16" top="5" layout="topleft" - left_pad="7" + left_pad="-5" name="TimeText" text_color="TimeTextColor" tool_tip="Current time (Pacific)" width="80"> 12:00 AM </text> + <button + follows="right|bottom" + height="16" + image_selected="parcel_drk_VoiceNo" + image_unselected="parcel_drk_Voice" + is_toggle="true" + left_pad="5" + top="1" + name="volume_btn" + tool_tip="Global Volume Control" + width="16" /> + <panel + class="panel_volume_pulldown" + follows="all" + height="533" + layout="topleft" + left="0" + name="volume_pulldown" + top="5" + visible="false" + width="313" /> + <text enabled="true" follows="right|bottom" diff --git a/indra/newview/skins/default/xui/en/panel_sys_well_item.xml b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml index 7722583ce2..ccb57b6552 100644 --- a/indra/newview/skins/default/xui/en/panel_sys_well_item.xml +++ b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml @@ -9,7 +9,10 @@ width="300" height="35" layout="topleft" - follows="left|right"> + follows="left|right" + background_opaque="false" + background_visible="true" + bg_alpha_color="0.0 0.0 0.0 0.0" > <text top="2" left="10" diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml index 1f67a0a732..3384852f27 100644 --- a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml @@ -18,7 +18,7 @@ visible="false" width="380" /> <icon - height="24" + height="20" follows="top|right|left" image_name="ListItem_Select" layout="topleft" @@ -26,7 +26,7 @@ name="selected_icon" top="0" visible="false" - width="320" /> + width="380" /> <icon height="16" follows="top|left" @@ -46,7 +46,7 @@ text_color="white" top="4" value="..." - width="242" /> + width="330" /> <button follows="right" height="20" @@ -55,7 +55,7 @@ left_pad="5" right="-3" name="profile_btn" - top_delta="-2" + top="1" visible="false" width="20" /> </panel> diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml new file mode 100644 index 0000000000..4dae8e48a0 --- /dev/null +++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml @@ -0,0 +1,111 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + background_visible="true" + follows="all" + height="400" + label="Appearance" + layout="topleft" + min_height="350" + min_width="240" + name="appearance panel" + width="333"> + <string + name="No Outfit" + value="No Outfit" /> + <panel + left="5" width="320" height="55" + background_visible="true" + background_opaque="false" + bg_alpha_color="0.2 0.2 0.2 1.0" + name="panel_currentlook" + follows="left|top|right"> + <button + follows="left|right|top" + font="SansSerif" + top="28" right="-10" width="60" height="20" + layout="topleft" + label="Edit" + name="editappearance_btn"/> + <button + follows="left|right|top" + top="28" left="5" width="25" height="22" + image_overlay="Inv_LookFolderOpen" + layout="topleft" + name="openoutfit_btn" + picture_style="true" /> + <text + top="10" width="150" left="5" height="15" follows="left|right|top" + layout="topleft" + font="SansSerif" text_color="LtGray" word_wrap="true" + mouse_opaque="false" name="currentlook_title"> + Current Outfit: + </text> + <text + top="32" width="150" left="32" height="15" follows="left|right|top" + layout="topleft" + font="SansSerifBold" text_color="white" word_wrap="true" + mouse_opaque="false" name="currentlook_name" > + MyOutfit + </text> + </panel> + + <filter_editor + follows="left|top|right" + font="SansSerif" + label="Filter" + layout="topleft" + left="15" + width="313" + height="20" + name="Filter" /> + <panel + class="panel_outfits_inventory" + filename="panel_outfits_inventory.xml" + name="panel_outfits_inventory" + follows="all" + height="271" + halign="center" + layout="topleft" + left="10" + top_pad="19" + width="313" /> + <button + follows="bottom|left" + height="25" + label="Wear" + layout="topleft" + left="10" + name="wear_btn" + top_pad="0" + width="80" /> + <button + follows="bottom|left" + height="25" + label="New Outfit" + layout="topleft" + left_pad="0" + name="newlook_btn" + top_delta="0" + width="90" /> + + <panel + class="panel_look_info" + filename="panel_look_info.xml" + follows="all" + layout="topleft" + left="0" + name="panel_look_info" + top="-200" + visible="false" /> + + <panel + class="panel_edit_wearable" + filename="panel_edit_wearable.xml" + follows="all" + layout="topleft" + left="0" + name="panel_edit_wearable" + top="-200" + visible="false" + width="333" /> +</panel> diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml index cbcc3f10ad..33a6a52f5c 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml @@ -1,127 +1,112 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- background_visible="true"
- follows="all"
- height="570"
- label="Things"
- layout="topleft"
- min_height="350"
- min_width="240"
- name="objects panel"
- width="333">
- <panel
- follows="all"
- layout="topleft"
- left="0"
- name="sidepanel__inventory_panel"
- top="0"
- label=""
- height="570"
- visible="true"
- width="330">
- <panel
- class="panel_main_inventory"
- filename="panel_main_inventory.xml"
- follows="all"
- layout="topleft"
- left="0"
- name="panel_main_inventory"
- top="0"
- label=""
- height="500"
- width="330" />
- <panel
- height="25"
- layout="bottomright"
- help_topic="item_button_tab"
- name="button_panel"
- left="5"
- bottom="5"
- width="313">
- <button
- enabled="true"
- follows="bottom|left"
- font="SansSerifSmallBold"
- height="25"
- label="Info"
- layout="topleft"
- left="0"
- name="info_btn"
- top="0"
- width="60" />
- <button
- enabled="true"
- follows="bottom|left"
- font="SansSerifSmallBold"
- height="25"
- label="Share"
- layout="topleft"
- left_pad="5"
- name="share_btn"
- top="0"
- width="60" />
- <button
- enabled="false"
- follows="bottom|left"
- font="SansSerifSmallBold"
- height="25"
- label="Wear"
- layout="topleft"
- left="130"
- name="wear_btn"
- top="0"
- width="60" />
- <button
- enabled="false"
- follows="bottom|left"
- font="SansSerifSmallBold"
- height="25"
- label="Play"
- layout="topleft"
- name="play_btn"
- left="130"
- top="0"
- width="50" />
- <button
- enabled="false"
- follows="bottom|left"
- font="SansSerifSmallBold"
- height="25"
- label="Teleport"
- layout="topleft"
- left="130"
- name="teleport_btn"
- top="0"
- width="77" />
- </panel>
- </panel>
-
- <panel
- follows="all"
- layout="topleft"
- left="0"
- class="sidepanel_item_info"
- filename="sidepanel_item_info.xml"
- name="sidepanel__item_panel"
- top="0"
- label=""
- height="570"
- visible="false"
- width="330">
- </panel>
-
- <panel
- follows="all"
- layout="topleft"
- left="0"
- class="sidepanel_task_info"
- filename="sidepanel_task_info.xml"
- name="sidepanel__task_panel"
- top="0"
- label=""
- height="570"
- visible="false"
- width="330">
- </panel>
-
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + background_visible="true" + follows="all" + height="570" + label="Things" + layout="topleft" + min_height="350" + min_width="240" + name="objects panel" + width="333"> + <panel + follows="all" + layout="topleft" + left="0" + name="sidepanel__inventory_panel" + top="0" + label="" + height="570" + visible="true" + width="330"> + <panel + class="panel_main_inventory" + filename="panel_main_inventory.xml" + follows="all" + layout="topleft" + left="0" + name="panel_main_inventory" + top="0" + label="" + height="500" + width="330" /> + <panel + height="25" + layout="bottomright" + help_topic="item_button_tab" + name="button_panel" + left="5" + bottom="5" + width="313"> + <button + enabled="true" + follows="bottom|left" + height="25" + label="Info" + layout="topleft" + left="0" + name="info_btn" + top="0" + width="60" /> + <button + enabled="false" + follows="bottom|left" + height="25" + label="Wear" + layout="topleft" + left="130" + name="wear_btn" + top="0" + width="60" /> + <button + enabled="false" + follows="bottom|left" + height="25" + label="Play" + layout="topleft" + name="play_btn" + left="130" + top="0" + width="50" /> + <button + enabled="false" + follows="bottom|left" + height="25" + label="Teleport" + layout="topleft" + left="130" + name="teleport_btn" + top="0" + width="77" /> + </panel> + </panel> + + <panel + follows="all" + layout="topleft" + left="0" + class="sidepanel_item_info" + filename="sidepanel_item_info.xml" + name="sidepanel__item_panel" + top="0" + label="" + height="570" + visible="false" + width="330"> + </panel> + + <panel + follows="all" + layout="topleft" + left="0" + class="sidepanel_task_info" + filename="sidepanel_task_info.xml" + name="sidepanel__task_panel" + top="0" + label="" + height="570" + visible="false" + width="330"> + </panel> + +</panel> diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml index 39cd75074e..db8a844eb0 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml @@ -1,511 +1,519 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- auto_tile="true"
- height="570"
- layout="topleft"
- name="item properties"
- help_topic="item_properties"
- save_rect="true"
- title="Inventory Item Properties"
- width="333">
- <panel.string
- name="unknown">
- (unknown)
- </panel.string>
- <panel.string
- name="public">
- (public)
- </panel.string>
- <panel.string
- name="you_can">
- You can:
- </panel.string>
- <panel.string
- name="owner_can">
- Owner can:
- </panel.string>
- <panel.string
- name="acquiredDate">
- [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
- </panel.string>
- <icon
- follows="top|right"
- height="18"
- image_name="Lock"
- layout="topleft"
- right="-50"
- mouse_opaque="true"
- name="IconLocked"
- top="4"
- width="18" />
- <button
- follows="top|right"
- height="25"
- image_overlay="BackArrow_Off"
- layout="topleft"
- name="back_btn"
- picture_style="true"
- right="-5"
- tab_stop="false"
- top="0"
- width="25" />
- <panel
- follows="all"
- height="500"
- label=""
- layout="topleft"
- left="5"
- help_topic=""
- top="30"
- border="1"
- width="313">
- <text
- type="string"
- length="1"
- follows="left|top"
- height="10"
- layout="topleft"
- left="5"
- name="LabelItemNameTitle"
- top="5"
- width="78">
- Name:
- </text>
- <line_editor
- border_style="line"
- border_thickness="1"
- follows="left|top|right"
- height="16"
- layout="topleft"
- left_delta="78"
- max_length="63"
- name="LabelItemName"
- top_delta="0"
- width="225" />
- <text
- type="string"
- length="1"
- follows="left|top"
- height="10"
- layout="topleft"
- left="5"
- name="LabelItemDescTitle"
- top_delta="20"
- width="78">
- Description:
- </text>
- <line_editor
- border_style="line"
- border_thickness="1"
- follows="left|top|right"
- height="16"
- layout="topleft"
- left_delta="78"
- max_length="127"
- name="LabelItemDesc"
- top_delta="0"
- width="225" />
- <text
- type="string"
- length="1"
- follows="left|top"
- height="16"
- layout="topleft"
- left="10"
- name="LabelCreatorTitle"
- top="65"
- width="78">
- Creator:
- </text>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="16"
- layout="topleft"
- left_delta="78"
- name="LabelCreatorName"
- top_delta="0"
- width="200">
- Nicole Linden
- </text>
- <button
- follows="top|right"
- font="SansSerifSmall"
- height="16"
- label="Profile..."
- layout="topleft"
- left_delta="144"
- name="BtnCreator"
- top_delta="0"
- width="78" />
- <text
- type="string"
- length="1"
- follows="left|top"
- height="16"
- layout="topleft"
- left="10"
- name="LabelOwnerTitle"
- top="85"
- width="78">
- Owner:
- </text>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="16"
- layout="topleft"
- left_delta="78"
- name="LabelOwnerName"
- top_delta="0"
- width="200">
- Thrax Linden
- </text>
- <button
- follows="top|right"
- font="SansSerifSmall"
- height="16"
- label="Profile..."
- layout="topleft"
- left_delta="144"
- name="BtnOwner"
- top_delta="0"
- width="78" />
- <text
- type="string"
- length="1"
- follows="left|top"
- height="16"
- layout="topleft"
- left="10"
- name="LabelAcquiredTitle"
- top="105"
- width="78">
- Acquired:
- </text>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="16"
- layout="topleft"
- left_delta="78"
- name="LabelAcquiredDate"
- top_delta="0"
- width="252">
- Wed May 24 12:50:46 2006
- </text>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="10"
- layout="topleft"
- left="10"
- name="OwnerLabel"
- top="125"
- width="78">
- You:
- </text>
- <check_box
- height="16"
- label="Edit"
- layout="topleft"
- left_pad="5"
- name="CheckOwnerModify"
- top_delta="0"
- width="78" />
- <check_box
- height="16"
- label="Copy"
- layout="topleft"
- left_delta="0"
- name="CheckOwnerCopy"
- top_pad="5"
- width="88" />
- <check_box
- height="16"
- label="Resell"
- layout="topleft"
- left_delta="0"
- name="CheckOwnerTransfer"
- top_pad="5"
- width="106" />
- <text
- type="string"
- length="1"
- follows="left|top"
- height="10"
- layout="topleft"
- left="10"
- name="AnyoneLabel"
- top_pad="5"
- width="78">
- Anyone:
- </text>
- <check_box
- height="16"
- label="Copy"
- layout="topleft"
- left_pad="5"
- name="CheckEveryoneCopy"
- top_delta="0"
- width="130" />
- <text
- type="string"
- length="1"
- follows="left|top"
- height="10"
- layout="topleft"
- left="10"
- name="GroupLabel"
- top_pad="5"
- width="78">
- Group:
- </text>
- <check_box
- height="16"
- label="Share"
- layout="topleft"
- left_pad="5"
- name="CheckShareWithGroup"
- top_delta="5"
- width="106" />
- <text
- type="string"
- length="1"
- follows="left|top"
- height="10"
- layout="topleft"
- left="10"
- name="NextOwnerLabel"
- top_pad="5"
- width="78">
- Next owner:
- </text>
- <check_box
- height="16"
- label="Edit"
- layout="topleft"
- left_pad="5"
- name="CheckNextOwnerModify"
- top_delta="0"
- width="78" />
- <check_box
- height="16"
- label="Copy"
- layout="topleft"
- left_delta="0"
- name="CheckNextOwnerCopy"
- top_pad="5"
- width="88" />
- <check_box
- height="16"
- label="Resell"
- layout="topleft"
- left_delta="0"
- name="CheckNextOwnerTransfer"
- top_pad="5"
- width="106" />
- <check_box
- height="16"
- label="For Sale"
- layout="topleft"
- left="10"
- name="CheckPurchase"
- top_pad="5"
- width="78" />
- <combo_box
- height="19"
- left_pad="5"
- layout="topleft"
- follows="left|top"
- name="combobox sale copy"
- width="90">
- <combo_box.item
- label="Copy"
- name="Copy"
- value="Copy" />
- <combo_box.item
- label="Original"
- name="Original"
- value="Original" />
- </combo_box>
- <spinner
- follows="left|top"
- decimal_digits="0"
- increment="1"
- control_name="Edit Cost"
- name="Edit Cost"
- label="Price: L$"
- label_width="60"
- left="10"
- width="180"
- min_val="1"
- height="19"
- max_val="999999999"
- top_pad="5"/>
- <!--line_editor
- border_style="line"
- border_thickness="1"
- follows="left|top|right"
- height="16"
- layout="topleft"
- left_pad="5"
- max_length="25"
- name="EditPrice"
- top_delta="0"
- width="242" /-->
- <!--text
- type="string"
- length="1"
- follows="left|top"
- height="10"
- layout="topleft"
- left="10"
- name="BaseMaskDebug"
- top="155"
- width="330">
- B:
- </text>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="10"
- layout="topleft"
- left_delta="60"
- name="OwnerMaskDebug"
- top_delta="0"
- width="270">
- O:
- </text>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="10"
- layout="topleft"
- left_delta="60"
- name="GroupMaskDebug"
- top_delta="0"
- width="210">
- G:
- </text>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="10"
- layout="topleft"
- left_delta="60"
- name="EveryoneMaskDebug"
- top_delta="0"
- width="150">
- E:
- </text>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="10"
- layout="topleft"
- left_delta="60"
- name="NextMaskDebug"
- top_delta="0"
- width="90">
- N:
- </text-->
- <!--text
- type="string"
- length="1"
- follows="left|top"
- height="10"
- layout="topleft"
- left="10"
- name="SaleLabel"
- top_pad="5"
- width="330">
- Mark Item:
- </text-->
- <!--radio_group
- draw_border="false"
- follows="left|top|right"
- height="16"
- layout="topleft"
- left_delta="78"
- name="RadioSaleType"
- top_delta="0"
- width="252">
- <radio_item
- height="16"
- label="Original"
- layout="topleft"
- left="0"
- name="radio"
- top="0"
- width="70" />
- <radio_item
- height="16"
- label="Copy"
- layout="topleft"
- left_delta="60"
- name="radio2"
- top_delta="0"
- width="70" />
- </radio_group-->
- <!--text
- type="string"
- length="1"
- follows="left|top"
- height="16"
- layout="topleft"
- left="10"
- name="TextPrice"
- top_pad="5"
- width="78">
- Price: L$
- </text-->
- </panel>
- <panel
- height="25"
- layout="bottomright"
- help_topic="button_tab"
- name="button_panel"
- left="5"
- bottom="5"
- width="313">
- <button
- follows="bottom|left"
- font="SansSerifSmallBold"
- height="25"
- label="Edit"
- layout="topleft"
- left="0"
- name="edit_btn"
- top="0"
- width="50" />
- <button
- follows="bottom|right"
- font="SansSerifSmallBold"
- height="25"
- label="Cancel"
- layout="topleft"
- name="cancel_btn"
- right="-1"
- top="0"
- width="70" />
- <button
- follows="bottom|right"
- font="SansSerifSmallBold"
- height="25"
- label="Save"
- layout="topleft"
- name="save_btn"
- left_pad="-135"
- top="0"
- width="60" />
- </panel>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + auto_tile="true" + height="570" + layout="topleft" + name="item properties" + help_topic="item_properties" + save_rect="true" + title="Inventory Item Properties" + width="333"> + <panel.string + name="unknown"> + (unknown) + </panel.string> + <panel.string + name="public"> + (public) + </panel.string> + <panel.string + name="you_can"> + You can: + </panel.string> + <panel.string + name="owner_can"> + Owner can: + </panel.string> + <panel.string + name="acquiredDate"> + [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + </panel.string> + <icon + follows="top|right" + height="18" + image_name="Lock" + layout="topleft" + right="-50" + mouse_opaque="true" + name="IconLocked" + top="4" + width="18" /> + <button + follows="top|right" + height="25" + image_overlay="BackArrow_Off" + layout="topleft" + name="back_btn" + picture_style="true" + right="-5" + tab_stop="false" + top="0" + width="25" /> + <panel + follows="all" + height="500" + label="" + layout="topleft" + left="5" + help_topic="" + top="30" + border="1" + width="313"> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="5" + name="LabelItemNameTitle" + top="5" + width="78"> + Name: + </text> + <line_editor + border_style="line" + border_thickness="1" + follows="left|top|right" + height="16" + layout="topleft" + left_delta="78" + max_length="63" + name="LabelItemName" + top_delta="0" + width="225" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="5" + name="LabelItemDescTitle" + top_delta="20" + width="78"> + Description: + </text> + <line_editor + border_style="line" + border_thickness="1" + follows="left|top|right" + height="16" + layout="topleft" + left_delta="78" + max_length="127" + name="LabelItemDesc" + top_delta="0" + width="225" /> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="10" + name="LabelCreatorTitle" + top="65" + width="78"> + Creator: + </text> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left_delta="78" + name="LabelCreatorName" + top_delta="0" + width="140"> + Nicole Linden + </text> + <button + follows="top|right" + height="16" + label="Profile..." + layout="topleft" + left_delta="144" + name="BtnCreator" + top_delta="0" + width="78" /> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="10" + name="LabelOwnerTitle" + top="85" + width="78"> + Owner: + </text> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left_delta="78" + name="LabelOwnerName" + top_delta="0" + width="140"> + Thrax Linden + </text> + <button + follows="top|right" + height="16" + label="Profile..." + layout="topleft" + left_delta="144" + name="BtnOwner" + top_delta="0" + width="78" /> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="10" + name="LabelAcquiredTitle" + top="105" + width="78"> + Acquired: + </text> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left_delta="78" + name="LabelAcquiredDate" + top_delta="0" + width="222"> + Wed May 24 12:50:46 2006 + </text> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="10" + name="OwnerLabel" + top="125" + width="78"> + You: + </text> + <check_box + height="16" + label="Edit" + layout="topleft" + left_pad="5" + name="CheckOwnerModify" + top_delta="0" + width="78" /> + <check_box + height="16" + label="Copy" + layout="topleft" + left_delta="0" + name="CheckOwnerCopy" + top_pad="5" + width="88" /> + <check_box + height="16" + label="Resell" + layout="topleft" + left_delta="0" + name="CheckOwnerTransfer" + top_pad="5" + width="106" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="10" + name="AnyoneLabel" + top_pad="5" + width="78"> + Anyone: + </text> + <check_box + height="16" + label="Copy" + layout="topleft" + left_pad="5" + name="CheckEveryoneCopy" + top_delta="0" + width="130" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="10" + name="GroupLabel" + top_pad="5" + width="78"> + Group: + </text> + <check_box + height="16" + label="Share" + layout="topleft" + left_pad="5" + name="CheckShareWithGroup" + top_delta="5" + width="106" /> + <text + type="string" + length="1" + follows="left|top" + height="25" + layout="topleft" + left="10" + name="NextOwnerLabel" + top_pad="5" + width="78" + word_wrap="true"> + Next owner: + </text> + <check_box + height="16" + label="Edit" + layout="topleft" + left_pad="5" + name="CheckNextOwnerModify" + top_delta="0" + width="78" /> + <check_box + height="16" + label="Copy" + layout="topleft" + left_delta="0" + name="CheckNextOwnerCopy" + top_pad="5" + width="88" /> + <check_box + height="16" + label="Resell" + layout="topleft" + left_delta="0" + name="CheckNextOwnerTransfer" + top_pad="5" + width="106" /> + <check_box + height="16" + label="For Sale" + layout="topleft" + left="10" + name="CheckPurchase" + top_pad="5" + width="78" /> + <combo_box + height="19" + left_pad="5" + layout="topleft" + follows="left|top" + name="combobox sale copy" + width="110"> + <combo_box.item + label="Copy" + name="Copy" + value="Copy" /> + <combo_box.item + label="Original" + name="Original" + value="Original" /> + </combo_box> + <spinner + follows="left|top" + decimal_digits="0" + increment="1" + control_name="Edit Cost" + name="Edit Cost" + label="Price:" + label_width="100" + left="10" + width="192" + min_val="1" + height="19" + max_val="999999999" + top_pad="5"/> + <text + type="string" + length="1" + height="15" + follows="left|top" + layout="topleft" + left_delta="82" + name="CurrencySymbol" + top_delta="1" + width="18"> + L$ + </text> + <!--line_editor + border_style="line" + border_thickness="1" + follows="left|top|right" + height="16" + layout="topleft" + left_pad="5" + max_length="25" + name="EditPrice" + top_delta="0" + width="242" /--> + <!--text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="10" + name="BaseMaskDebug" + top="155" + width="330"> + B: + </text> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_delta="60" + name="OwnerMaskDebug" + top_delta="0" + width="270"> + O: + </text> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_delta="60" + name="GroupMaskDebug" + top_delta="0" + width="210"> + G: + </text> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_delta="60" + name="EveryoneMaskDebug" + top_delta="0" + width="150"> + E: + </text> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_delta="60" + name="NextMaskDebug" + top_delta="0" + width="90"> + N: + </text--> + <!--text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="10" + name="SaleLabel" + top_pad="5" + width="330"> + Mark Item: + </text--> + <!--radio_group + draw_border="false" + follows="left|top|right" + height="16" + layout="topleft" + left_delta="78" + name="RadioSaleType" + top_delta="0" + width="252"> + <radio_item + height="16" + label="Original" + layout="topleft" + left="0" + name="radio" + top="0" + width="70" /> + <radio_item + height="16" + label="Copy" + layout="topleft" + left_delta="60" + name="radio2" + top_delta="0" + width="70" /> + </radio_group--> + <!--text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="10" + name="TextPrice" + top_pad="5" + width="78"> + Price: L$ + </text--> + </panel> + <panel + height="25" + layout="bottomright" + help_topic="button_tab" + name="button_panel" + left="5" + bottom="5" + width="313"> + <button + follows="bottom|left" + height="25" + label="Edit" + layout="topleft" + left="0" + name="edit_btn" + top="0" + width="50" /> + <button + follows="bottom|right" + height="25" + label="Cancel" + layout="topleft" + name="cancel_btn" + right="-1" + top="0" + width="70" /> + <button + follows="bottom|right" + height="25" + label="Save" + layout="topleft" + name="save_btn" + left_pad="-135" + top="0" + width="60" /> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml index 8eb2254112..348f0dfc09 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml @@ -203,7 +203,6 @@ width="150" /> <button follows="top|left" - font="SansSerifSmall" height="20" label="Deed" label_selected="Deed" @@ -485,7 +484,6 @@ width="313"> <button follows="bottom|left" - font="SansSerifSmallBold" height="25" label="Edit" layout="topleft" @@ -495,7 +493,6 @@ width="50" /> <button follows="bottom|left" - font="SansSerifSmallBold" height="25" label="Open" layout="topleft" @@ -505,7 +502,6 @@ width="60" /> <button follows="bottom|left" - font="SansSerifSmallBold" height="25" label="Pay" layout="topleft" @@ -515,7 +511,6 @@ width="50" /> <button follows="bottom|left" - font="SansSerifSmallBold" height="25" label="Buy" layout="topleft" @@ -525,7 +520,6 @@ width="60" /> <button follows="bottom|right" - font="SansSerifSmallBold" height="25" label="Cancel" layout="topleft" @@ -535,7 +529,6 @@ width="70" /> <button follows="bottom|right" - font="SansSerifSmallBold" height="25" label="Save" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 761c17cfd2..4b727e36ab 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <!-- This file contains strings that used to be hardcoded in the source. It is only for those strings which do not belong in a floater. - For example, the strings used in avatar chat bubbles, and strings + For example, the strings used in avatar chat bubbles, and strings that are returned from one component and may appear in many places--> <strings> @@ -44,8 +44,8 @@ <!-- Disconnection --> <string name="AgentLostConnection">This region may be experiencing trouble. Please check your connection to the Internet.</string> - - + + <!-- Tooltip, lltooltipview.cpp --> <string name="TooltipPerson">Person</string><!-- Object under mouse pointer is an avatar --> <string name="TooltipNoName">(no name)</string> <!-- No name on an object --> @@ -80,11 +80,11 @@ <!-- text for SLURL labels --> <string name="SLurlLabelTeleport">Teleport to</string> <string name="SLurlLabelShowOnMap">Show Map for</string> - + <!-- ButtonToolTips, llfloater.cpp --> <string name="BUTTON_CLOSE_DARWIN">Close (⌘W)</string> <string name="BUTTON_CLOSE_WIN">Close (Ctrl+W)</string> - <string name="BUTTON_RESTORE">Restore</string> + <string name="BUTTON_RESTORE">Restore</string> <string name="BUTTON_MINIMIZE">Minimize</string> <string name="BUTTON_TEAR_OFF">Tear Off</string> <string name="BUTTON_DOCK">Dock</string> @@ -103,24 +103,24 @@ <!-- Indicates something is being loaded. Maybe should be merged with RetrievingData --> <string name="LoadingData">Loading...</string> - - + + <!-- namecache --> <!-- Avatar name: text shown for LLUUID::null --> <string name="AvatarNameNobody">(nobody)</string> - + <!-- Avatar name: text shown while fetching name --> <string name="AvatarNameWaiting">(waiting)</string> <!-- Avatar name: More than one avatar is selected/used here --> <string name="AvatarNameMultiple">(multiple)</string> - + <!-- Avatar name: text shown as an alternative to AvatarNameFetching, easter egg. --> <string name="AvatarNameHippos">(hippos)</string> - + <!-- Group name: text shown for LLUUID::null --> <string name="GroupNameNone">(none)</string> - + <!-- Asset errors. Used in llassetstorage.cpp, translation from error code to error message. --> <string name="AssetErrorNone">No error</string> <string name="AssetErrorRequestFailed">Asset request: failed</string> @@ -133,7 +133,7 @@ <string name="AssetErrorCircuitGone">Circuit gone</string> <string name="AssetErrorPriceMismatch">Viewer and server do not agree on price</string> <string name="AssetErrorUnknownStatus">Unknown status</string> - + <!-- Asset Type human readable names: these will replace variable [TYPE] in notification FailedToFindWearable* --> <string name="texture">texture</string> <string name="sound">sound</string> @@ -159,7 +159,7 @@ <string name="simstate">simstate</string> <string name="favorite">favorite</string> <string name="symbolic link">link</string> - + <!-- llvoavatar. Displayed in the avatar chat bubble --> <string name="AvatarEditingAppearance">(Editing Appearance)</string> <string name="AvatarAway">Away</string> @@ -236,17 +236,17 @@ <string name="anim_express_worry">Worry</string> <string name="anim_yes_happy">Yes (Happy)</string> <string name="anim_yes_head">Yes</string> - + <!-- world map --> <string name="texture_loading">Loading...</string> <string name="worldmap_offline">Offline</string> <string name="worldmap_results_none_found">None found.</string> - + <!-- animations uploading status codes --> <string name="Ok">OK</string> <string name="Premature end of file">Premature end of file</string> <string name="ST_NO_JOINT">Can't find ROOT or JOINT.</string> - + <!-- Chat --> <string name="whisper">whispers:</string> <string name="shout">shouts:</string> @@ -274,7 +274,7 @@ <string name="SIM_ACCESS_ADULT">Adult</string> <string name="SIM_ACCESS_DOWN">Offline</string> <string name="SIM_ACCESS_MIN">Unknown</string> - + <!-- For use when we do not have land type back from the server --> <string name="land_type_unknown">(unknown)</string> @@ -294,14 +294,14 @@ <string name="compressed_image_files">Compressed Images</string> <string name="load_files">Load Files</string> <string name="choose_the_directory">Choose Directory</string> - + <!-- LSL Usage Hover Tips --> <!-- NOTE: For now these are set as translate="false", until DEV-40761 is implemented (to internationalize the rest of tooltips in the same window). This has no effect on viewer code, but prevents Linden Lab internal localization tool from scraping these strings. --> <string name="LSLTipSleepTime" translate="false"> Sleeps script for [SLEEP_TIME] seconds. </string> - + <string name="LSLTipText_llSin" translate="false"> float llSin(float theta) Returns the sine of theta (theta in radians) @@ -1732,7 +1732,7 @@ Returns the value for header for request_id </string> <string name="LSLTipText_llSetPrimMediaParams" translate="false"> llSetPrimMediaParams(integer face, list params) -Sets the media params for a particular face on an object. If media is not already on this object, add it. +Sets the media params for a particular face on an object. If media is not already on this object, add it. List is a set of name/value pairs in no particular order. Params not specified are unchanged, or if new media is added then set to the default specified. The possible names are below, along with the types of values and what they mean. </string> @@ -1747,11 +1747,11 @@ Clears (deletes) the media and all params from the given face. </string> <!-- Avatar busy/away mode --> - <string name="AvatarSetNotAway">Set Not Away</string> - <string name="AvatarSetAway">Set Away</string> - <string name="AvatarSetNotBusy">Set Not Busy</string> - <string name="AvatarSetBusy">Set Busy</string> - + <string name="AvatarSetNotAway">Not Away</string> + <string name="AvatarSetAway">Away</string> + <string name="AvatarSetNotBusy">Not Busy</string> + <string name="AvatarSetBusy">Busy</string> + <!-- Wearable Types --> <string name="shape">Shape</string> <string name="skin">Skin</string> @@ -1769,7 +1769,7 @@ Clears (deletes) the media and all params from the given face. <string name="alpha">Alpha</string> <string name="tattoo">Tattoo</string> <string name="invalid">invalid</string> - + <!-- notify --> <string name="next">Next</string> <string name="ok">OK</string> @@ -1782,12 +1782,11 @@ Clears (deletes) the media and all params from the given face. <string name="GroupNotifySaveAttachment">Save Attachment</string> <string name="TeleportOffer">Teleport offering</string> <!-- start-up toast's string--> - <string name="StartUpNotification">%d new notification arrived while you were away...</string> - <string name="StartUpNotifications">%d new notifications arrived while you were away...</string> + <string name="StartUpNotifications">New notifications arrived while you were away.</string> <!-- overflow toast's string--> <string name="OverflowInfoChannelString">You have %d more notification</string> - - + + <!-- body parts --> <string name="BodyPartsRightArm">Right Arm</string> <string name="BodyPartsHead">Head</string> @@ -1800,10 +1799,10 @@ Clears (deletes) the media and all params from the given face. <string name="GraphicsQualityLow">Low</string> <string name="GraphicsQualityMid">Mid</string> <string name="GraphicsQualityHigh">High</string> - + <!-- mouselook --> <string name="LeaveMouselook">Press ESC to return to World View</string> - + <!-- inventory --> <string name="InventoryNoMatchingItems">No matching items found in inventory.</string> <string name="InventoryNoTexture"> @@ -1820,6 +1819,9 @@ this texture in your inventory <string name="LoadingContents">Loading contents...</string> <string name="NoContents">No contents</string> <string name="WornOnAttachmentPoint" value=" (worn on [ATTACHMENT_POINT])" /> + <!-- Inventory permissions --> + <string name="PermYes">Yes</string> + <string name="PermNo">No</string> <!-- Gestures labels --> <!-- use value="" because they have preceding spaces --> @@ -1831,7 +1833,7 @@ this texture in your inventory <string name="Wave" value=" Wave " /> <string name="HelloAvatar" value=" Hello, avatar! " /> <string name="ViewAllGestures" value=" View All >>" /> - + <!-- inventory filter --> <!-- use value="" because they have preceding spaces --> <string name="Animations" value=" Animations," /> @@ -1881,21 +1883,21 @@ this texture in your inventory <!-- inventory FVBridge --> <string name="Buy">Buy</string> <string name="BuyforL$">Buy for L$</string> - + <string name="Stone">Stone</string> <string name="Metal">Metal</string> <string name="Glass">Glass</string> <string name="Wood">Wood</string> <string name="Flesh">Flesh</string> <string name="Plastic">Plastic</string> - <string name="Rubber">Rubber</string> + <string name="Rubber">Rubber</string> <string name="Light">Light</string> - + <!-- keyboard --> <string name="KBShift">Shift</string> <string name="KBCtrl">Ctrl</string> - <!-- Avatar Skeleton --> + <!-- Avatar Skeleton --> <string name="Chest">Chest</string> <string name="Skull">Skull</string> <string name="Left Shoulder">Left Shoulder</string> @@ -1925,7 +1927,7 @@ this texture in your inventory <string name="L Lower Leg">L Lower Leg</string> <string name="Stomach">Stomach</string> <string name="Left Pec">Left Pec</string> - <string name="Right Pec">Right Pec</string> + <string name="Right Pec">Right Pec</string> <!-- Avatar age computation, see LLDateUtil::ageFromDate --> <string name="YearsMonthsOld">[AGEYEARS] [AGEMONTHS] old</string> @@ -1934,7 +1936,7 @@ this texture in your inventory <string name="WeeksOld">[AGEWEEKS] old</string> <string name="DaysOld">[AGEDAYS] old</string> <string name="TodayOld">Joined today</string> - + <!-- AgeYearsA = singular, AgeYearsB = plural, AgeYearsC = plural for non-English languages like Russian @@ -1967,16 +1969,16 @@ this texture in your inventory <string name="NoPaymentInfoOnFile">No Payment Info On File</string> <string name="AgeVerified">Age-verified</string> <string name="NotAgeVerified">Not Age-verified</string> - - <!-- HUD Position --> - <string name="Center 2">Center 2</string> - <string name="Top Right">Top Right</string> - <string name="Top">Top</string> - <string name="Top Left">Top Left</string> - <string name="Center">Center</string> - <string name="Bottom Left">Bottom Left</string> - <string name="Bottom">Bottom</string> - <string name="Bottom Right">Bottom Right</string> + + <!-- HUD Position --> + <string name="Center 2">Center 2</string> + <string name="Top Right">Top Right</string> + <string name="Top">Top</string> + <string name="Top Left">Top Left</string> + <string name="Center">Center</string> + <string name="Bottom Left">Bottom Left</string> + <string name="Bottom">Bottom</string> + <string name="Bottom Right">Bottom Right</string> <!-- compile queue--> <string name="CompileQueueDownloadedCompiling">Downloaded, now compiling</string> @@ -1998,11 +2000,11 @@ this texture in your inventory <string name="CompileSuccessful">Compile successful!</string> <string name="CompileSuccessfulSaving">Compile successful, saving...</string> <string name="SaveComplete">Save complete.</string> - <string name="ObjectOutOfRange">Script (object out of range)</string> - + <string name="ObjectOutOfRange">Script (object out of range)</string> + <!-- god tools --> <string name="GodToolsObjectOwnedBy">Object [OBJECT] owned by [OWNER]</string> - + <!-- groups --> <string name="GroupsNone">none</string> <string name="Group" value=" (group)" /> @@ -2013,14 +2015,14 @@ this texture in your inventory <string name="Balance">Balance</string> <string name="Credits">Credits</string> <string name="Debits">Debits</string> - <string name="Total">Total</string> - <string name="NoGroupDataFound">No group data found for group </string> - + <string name="Total">Total</string> + <string name="NoGroupDataFound">No group data found for group </string> + <!-- floater IM --> <string name="IMParentEstate">parent estate</string> <string name="IMMainland">mainland</string> <string name="IMTeen">teen</string> - + <!-- floater region info --> <!-- The following will replace variable [ALL_ESTATES] in notifications EstateAllowed*, EstateBanned*, EstateManager* --> <string name="RegionInfoError">error</string> @@ -2036,45 +2038,37 @@ this texture in your inventory <!-- script editor --> <string name="CursorPos">Line [LINE], Column [COLUMN]</string> - + <!-- panel dir browser --> <string name="PanelDirCountFound">[COUNT] found</string> <string name="PanelDirTimeStr">[hour12,datetime,slt]:[min,datetime,slt] [ampm,datetime,slt]</string> <!-- panel dir events --> <string name="PanelDirEventsDateText">[mthnum,datetime,slt]/[day,datetime,slt]</string> - + <!-- panel contents --> <string name="PanelContentsNewScript">New Script</string> - + <!-- Mute --> <string name="MuteByName">(by name)</string> <string name="MuteAgent">(resident)</string> <string name="MuteObject">(object)</string> <string name="MuteGroup">(group)</string> - + <!-- Region/Estate Covenant --> <string name="RegionNoCovenant">There is no Covenant provided for this Estate.</string> <string name="RegionNoCovenantOtherOwner">There is no Covenant provided for this Estate. The land on this estate is being sold by the Estate owner, not Linden Lab. Please contact the Estate Owner for sales details.</string> <string name="covenant_last_modified">Last Modified:</string> <string name="none_text" value=" (none) " /> <string name="never_text" value=" (never) " /> - + <!--Region Details--> <string name="GroupOwned">Group Owned</string> <string name="Public">Public</string> - + <!-- panel classified --> <string name="ClassifiedClicksTxt">Clicks: [TELEPORT] teleport, [MAP] map, [PROFILE] profile</string> <string name="ClassifiedUpdateAfterPublish">(will update after publish)</string> - - <!-- group voting dialog --> - <string name="GroupVoteYes">Yes</string> - <string name="GroupVoteNo">No</string> - <string name="GroupVoteNoActiveProposals">There are currently no active proposals</string> - <string name="GroupVoteNoArchivedProposals">There are currently no archived proposals</string> - <string name="GroupVoteRetrievingArchivedProposals">Retrieving archived proposals</string> - <string name="GroupVoteRetrievingActiveProposals">Retrieving active proposals</string> <!-- Multi Preview Floater --> <string name="MultiPreviewTitle">Preview</string> @@ -2089,7 +2083,7 @@ this texture in your inventory <string name="InvOfferGaveYou">gave you</string> <string name="InvOfferYouDecline">You decline</string> <string name="InvOfferFrom">from</string> - + <!-- group money --> <string name="GroupMoneyTotal">Total</string> <string name="GroupMoneyBought">bought</string> @@ -2101,21 +2095,21 @@ this texture in your inventory <string name="GroupMoneyBalance">Balance</string> <string name="GroupMoneyCredits">Credits</string> <string name="GroupMoneyDebits">Debits</string> - + <!-- viewer object --> <string name="ViewerObjectContents">Contents</string> - + <!-- Viewer menu --> <string name="AcquiredItems">Acquired Items</string> - <string name="Cancel">Cancel</string> - <string name="UploadingCosts">Uploading %s costs</string> + <string name="Cancel">Cancel</string> + <string name="UploadingCosts">Uploading %s costs</string> <string name="UnknownFileExtension"> Unknown file extension .%s Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh - </string> - <string name="AddLandmarkNavBarMenu">Add Landmark...</string> + </string> + <string name="AddLandmarkNavBarMenu">Add Landmark...</string> <string name="EditLandmarkNavBarMenu">Edit Landmark...</string> - + <!-- menu accelerators --> <string name="accel-mac-control">⌃</string> <string name="accel-mac-command">⌘</string> @@ -2126,72 +2120,72 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh <string name="accel-win-shift">Shift+</string> <!-- Previews --> - <string name="FileSaved">File Saved</string> - <string name="Receiving">Receiving</string> - + <string name="FileSaved">File Saved</string> + <string name="Receiving">Receiving</string> + <!-- status bar , Time --> - <string name="AM">AM</string> - <string name="PM">PM</string> - <string name="PST">PST</string> - <string name="PDT">PDT</string> + <string name="AM">AM</string> + <string name="PM">PM</string> + <string name="PST">PST</string> + <string name="PDT">PDT</string> <!-- Directions, HUD --> - <string name="Forward">Forward</string> - <string name="Left">Left</string> - <string name="Right">Right</string> - <string name="Back">Back</string> - <string name="North">North</string> - <string name="South">South</string> - <string name="West">West</string> - <string name="East">East</string> - <string name="Up">Up</string> - <string name="Down">Down</string> + <string name="Forward">Forward</string> + <string name="Left">Left</string> + <string name="Right">Right</string> + <string name="Back">Back</string> + <string name="North">North</string> + <string name="South">South</string> + <string name="West">West</string> + <string name="East">East</string> + <string name="Up">Up</string> + <string name="Down">Down</string> <!-- Search Category Strings --> - <string name="Any Category">Any Category</string> - <string name="Shopping">Shopping</string> - <string name="Land Rental">Land Rental</string> - <string name="Property Rental">Property Rental</string> - <string name="Special Attraction">Special Attraction</string> - <string name="New Products">New Products</string> - <string name="Employment">Employment</string> - <string name="Wanted">Wanted</string> - <string name="Service">Service</string> - <string name="Personal">Personal</string> + <string name="Any Category">Any Category</string> + <string name="Shopping">Shopping</string> + <string name="Land Rental">Land Rental</string> + <string name="Property Rental">Property Rental</string> + <string name="Special Attraction">Special Attraction</string> + <string name="New Products">New Products</string> + <string name="Employment">Employment</string> + <string name="Wanted">Wanted</string> + <string name="Service">Service</string> + <string name="Personal">Personal</string> <!-- PARCEL_CATEGORY_UI_STRING --> - <string name="None">None</string> - <string name="Linden Location">Linden Location</string> - <string name="Adult">Adult</string> - <string name="Arts&Culture">Arts & Culture</string> - <string name="Business">Business</string> - <string name="Educational">Educational</string> - <string name="Gaming">Gaming</string> - <string name="Hangout">Hangout</string> - <string name="Newcomer Friendly">Newcomer Friendly</string> + <string name="None">None</string> + <string name="Linden Location">Linden Location</string> + <string name="Adult">Adult</string> + <string name="Arts&Culture">Arts & Culture</string> + <string name="Business">Business</string> + <string name="Educational">Educational</string> + <string name="Gaming">Gaming</string> + <string name="Hangout">Hangout</string> + <string name="Newcomer Friendly">Newcomer Friendly</string> <string name="Parks&Nature">Parks & Nature</string> - <string name="Residential">Residential</string> + <string name="Residential">Residential</string> <!--<string name="Shopping">Shopping</string> --> - <string name="Stage">Stage</string> - <string name="Other">Other</string> - <string name="Any">Any</string> - <string name="You">You</string> - + <string name="Stage">Stage</string> + <string name="Other">Other</string> + <string name="Any">Any</string> + <string name="You">You</string> + <!-- punctuations --> - <string name=":">:</string> - <string name=",">,</string> - <string name="...">...</string> - <string name="***">***</string> - <string name="(">(</string> + <string name=":">:</string> + <string name=",">,</string> + <string name="...">...</string> + <string name="***">***</string> + <string name="(">(</string> <string name=")">)</string> - <string name=".">.</string> - <string name="'">'</string> - <string name="---">---</string> + <string name=".">.</string> + <string name="'">'</string> + <string name="---">---</string> <!-- media --> <string name="Multiple Media">Multiple Media</string> <string name="Play Media">Play/Pause Media</string> - + <!-- OSMessageBox messages --> <string name="MBCmdLineError"> An error was found parsing the command line. @@ -2269,22 +2263,17 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Attached">Attached</string> <string name="Attached Earlobes">Attached Earlobes</string> -<string name="Back Bangs">Back Bangs</string> -<string name="Back Bangs Down">Back Bangs Down</string> -<string name="Back Bangs Up">Back Bangs Up</string> + <string name="Back Fringe">Back Fringe</string> -<string name="Back Hair">Back Hair</string> -<string name="Back Hair Down">Back Hair Down</string> -<string name="Back Hair Up">Back Hair Up</string> + <string name="Baggy">Baggy</string> <string name="Bangs">Bangs</string> -<string name="Bangs Down">Bangs Down</string> -<string name="Bangs Up">Bangs Up</string> + <string name="Beady Eyes">Beady Eyes</string> <string name="Belly Size">Belly Size</string> <string name="Big">Big</string> <string name="Big Butt">Big Butt</string> -<string name="Big Eyeball">Big Eyeball</string> + <string name="Big Hair Back">Big Hair: Back</string> <string name="Big Hair Front">Big Hair: Front</string> <string name="Big Hair Top">Big Hair: Top</string> @@ -2354,20 +2343,20 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Corner Down">Corner Down</string> -<string name="Corner Normal">Corner Normal</string> + <string name="Corner Up">Corner Up</string> <string name="Creased">Creased</string> <string name="Crooked Nose">Crooked Nose</string> -<string name="Cropped Hair">Cropped Hair</string> + <string name="Cuff Flare">Cuff Flare</string> <string name="Dark">Dark</string> <string name="Dark Green">Dark Green</string> <string name="Darker">Darker</string> <string name="Deep">Deep</string> <string name="Default Heels">Default Heels</string> -<string name="Default Toe">Default Toe</string> + <string name="Dense">Dense</string> -<string name="Dense hair">Dense hair</string> + <string name="Double Chin">Double Chin</string> <string name="Downturned">Downturned</string> <string name="Duffle Bag">Duffle Bag</string> @@ -2383,7 +2372,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Eye Pop">Eye Pop</string> <string name="Eye Size">Eye Size</string> <string name="Eye Spacing">Eye Spacing</string> -<string name="Eyeball Size">Eyeball Size</string> + <string name="Eyebrow Arc">Eyebrow Arc</string> <string name="Eyebrow Density">Eyebrow Density</string> @@ -2394,27 +2383,22 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Eyelash Length">Eyelash Length</string> <string name="Eyeliner">Eyeliner</string> <string name="Eyeliner Color">Eyeliner Color</string> -<string name="Eyes Back">Eyes Back</string> + <string name="Eyes Bugged">Eyes Bugged</string> -<string name="Eyes Forward">Eyes Forward</string> -<string name="Eyes Long Head">Eyes Long Head</string> + + <string name="Eyes Shear Left Up">Eyes Shear Left Up</string> <string name="Eyes Shear Right Up">Eyes Shear Right Up</string> -<string name="Eyes Short Head">Eyes Short Head</string> -<string name="Eyes Spread">Eyes Spread</string> -<string name="Eyes Sunken">Eyes Sunken</string> -<string name="Eyes Together">Eyes Together</string> + + + + <string name="Face Shear">Face Shear</string> <string name="Facial Definition">Facial Definition</string> <string name="Far Set Eyes">Far Set Eyes</string> -<string name="Fat">Fat</string> -<string name="Fat Head">Fat Head</string> + <string name="Fat Lips">Fat Lips</string> -<string name="Fat Lower">Fat Lower</string> -<string name="Fat Lower Lip">Fat Lower Lip</string> -<string name="Fat Torso">Fat Torso</string> -<string name="Fat Upper">Fat Upper</string> -<string name="Fat Upper Lip">Fat Upper Lip</string> + <string name="Female">Female</string> <string name="Fingerless">Fingerless</string> <string name="Fingers">Fingers</string> @@ -2427,12 +2411,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Forehead Angle">Forehead Angle</string> <string name="Forehead Heavy">Forehead Heavy</string> <string name="Freckles">Freckles</string> -<string name="Front Bangs Down">Front Bangs Down</string> -<string name="Front Bangs Up">Front Bangs Up</string> + <string name="Front Fringe">Front Fringe</string> -<string name="Front Hair">Front Hair</string> -<string name="Front Hair Down">Front Hair Down</string> -<string name="Front Hair Up">Front Hair Up</string> + <string name="Full Back">Full Back</string> <string name="Full Eyeliner">Full Eyeliner</string> <string name="Full Front">Full Front</string> @@ -2531,7 +2512,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Long Ponytail">Long Ponytail</string> <string name="Long Torso">Long Torso</string> <string name="Long arms">Long arms</string> -<string name="Longcuffs">Longcuffs</string> + <string name="Loose Pants">Loose Pants</string> <string name="Loose Shirt">Loose Shirt</string> @@ -2591,7 +2572,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="No Blush">No Blush</string> <string name="No Eyeliner">No Eyeliner</string> <string name="No Eyeshadow">No Eyeshadow</string> -<string name="No Heels">No Heels</string> + <string name="No Lipgloss">No Lipgloss</string> <string name="No Lipstick">No Lipstick</string> <string name="No Part">No Part</string> @@ -2612,7 +2593,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Nostril Division">Nostril Division</string> <string name="Nostril Width">Nostril Width</string> -<string name="Old">Old</string> + <string name="Opaque">Opaque</string> <string name="Open">Open</string> <string name="Open Back">Open Back</string> @@ -2649,7 +2630,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Platform Width">Platform Width</string> <string name="Pointy">Pointy</string> <string name="Pointy Heels">Pointy Heels</string> -<string name="Pointy Toe">Pointy Toe</string> + <string name="Ponytail">Ponytail</string> <string name="Poofy Skirt">Poofy Skirt</string> <string name="Pop Left Eye">Pop Left Eye</string> @@ -2658,30 +2639,30 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Puffy Eyelids">Puffy Eyelids</string> <string name="Rainbow Color">Rainbow Color</string> <string name="Red Hair">Red Hair</string> -<string name="Red Skin">Red Skin</string> + <string name="Regular">Regular</string> -<string name="Regular Muscles">Regular Muscles</string> + <string name="Right Part">Right Part</string> <string name="Rosy Complexion">Rosy Complexion</string> <string name="Round">Round</string> -<string name="Round Forehead">Round Forehead</string> + <string name="Ruddiness">Ruddiness</string> <string name="Ruddy">Ruddy</string> <string name="Rumpled Hair">Rumpled Hair</string> <string name="Saddle Bags">Saddle Bags</string> -<string name="Saddlebags">Saddlebags</string> -<string name="Scrawny">Scrawny</string> + + <string name="Scrawny Leg">Scrawny Leg</string> <string name="Separate">Separate</string> -<string name="Shading">Shading</string> -<string name="Shadow hair">Shadow hair</string> + + <string name="Shallow">Shallow</string> <string name="Shear Back">Shear Back</string> <string name="Shear Face">Shear Face</string> <string name="Shear Front">Shear Front</string> -<string name="Shear Left">Shear Left</string> + <string name="Shear Left Up">Shear Left Up</string> -<string name="Shear Right">Shear Right</string> + <string name="Shear Right Up">Shear Right Up</string> <string name="Sheared Back">Sheared Back</string> <string name="Sheared Front">Sheared Front</string> @@ -2705,16 +2686,14 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Short Torso">Short Torso</string> <string name="Short hips">Short hips</string> <string name="Shoulders">Shoulders</string> -<string name="Side Bangs">Side Bangs</string> -<string name="Side Bangs Down">Side Bangs Down</string> -<string name="Side Bangs Up">Side Bangs Up</string> + <string name="Side Fringe">Side Fringe</string> <string name="Sideburns">Sideburns</string> <string name="Sides Hair">Sides Hair</string> <string name="Sides Hair Down">Sides Hair Down</string> <string name="Sides Hair Up">Sides Hair Up</string> -<string name="Skinny">Skinny</string> + <string name="Skinny Neck">Skinny Neck</string> <string name="Skirt Fit">Skirt Fit</string> <string name="Skirt Length">Skirt Length</string> @@ -2735,7 +2714,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Smooth Hair">Smooth Hair</string> <string name="Socks Length">Socks Length</string> -<string name="Some">Some</string> + <string name="Soulpatch">Soulpatch</string> <string name="Sparse">Sparse</string> @@ -2743,24 +2722,21 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Square">Square</string> <string name="Square Toe">Square Toe</string> <string name="Squash Head">Squash Head</string> -<string name="Squash/Stretch Head">Squash/Stretch Head</string> + <string name="Stretch Head">Stretch Head</string> <string name="Sunken">Sunken</string> <string name="Sunken Chest">Sunken Chest</string> <string name="Sunken Eyes">Sunken Eyes</string> <string name="Sweep Back">Sweep Back</string> <string name="Sweep Forward">Sweep Forward</string> -<string name="Swept Back">Swept Back</string> -<string name="Swept Back Hair">Swept Back Hair</string> -<string name="Swept Forward">Swept Forward</string> -<string name="Swept Forward Hair">Swept Forward Hair</string> + <string name="Tall">Tall</string> <string name="Taper Back">Taper Back</string> <string name="Taper Front">Taper Front</string> <string name="Thick Heels">Thick Heels</string> <string name="Thick Neck">Thick Neck</string> <string name="Thick Toe">Thick Toe</string> -<string name="Thickness">Thickness</string> + <string name="Thin">Thin</string> <string name="Thin Eyebrows">Thin Eyebrows</string> <string name="Thin Lips">Thin Lips</string> @@ -2771,8 +2747,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Tight Shirt">Tight Shirt</string> <string name="Tight Skirt">Tight Skirt</string> <string name="Tight Sleeves">Tight Sleeves</string> -<string name="Tilt Left">Tilt Left</string> -<string name="Tilt Right">Tilt Right</string> + <string name="Toe Shape">Toe Shape</string> <string name="Toe Thickness">Toe Thickness</string> <string name="Torso Length">Torso Length</string> @@ -2800,13 +2775,13 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Wide Lips">Wide Lips</string> <string name="Wild">Wild</string> <string name="Wrinkles">Wrinkles</string> - + <!-- Favorites Bar --> <string name="LocationCtrlAddLandmarkTooltip">Add to My Landmarks</string> <string name="LocationCtrlEditLandmarkTooltip">Edit My Landmark</string> <string name="LocationCtrlInfoBtnTooltip">See more info about the current location</string> <string name="LocationCtrlComboBtnTooltip">My location history</string> - + <!-- Strings used by the (currently Linux) auto-updater app --> <string name="UpdaterWindowTitle"> [APP_NAME] Update diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml index 5bb48ef5aa..28ed560543 100644 --- a/indra/newview/skins/default/xui/en/widgets/button.xml +++ b/indra/newview/skins/default/xui/en/widgets/button.xml @@ -1,4 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<!-- Additional attributes: + image_pressed + image_pressed_selected + --> <button image_unselected="PushButton_Off" image_selected="PushButton_Selected" image_disabled_selected="PushButton_Selected_Disabled" @@ -11,7 +15,7 @@ image_color="ButtonImageColor" image_color_disabled="ButtonImageColor" flash_color="ButtonFlashBgColor" - font="SansSerifSmall" + font="SansSerifSmall" hover_glow_amount="0.15" halign="center" scale_image="true"> diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml new file mode 100644 index 0000000000..5011bf6a61 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<chiclet_script
+ name="script_chiclet">
+ <icon
+ name="chiclet_icon"
+ follows="all"
+ mouse_opaque="false"
+ image_name="Generic_Object_Small" />
+</expandable_text>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/widgets/combo_box.xml b/indra/newview/skins/default/xui/en/widgets/combo_box.xml index fa3cb9275e..132bd24bca 100644 --- a/indra/newview/skins/default/xui/en/widgets/combo_box.xml +++ b/indra/newview/skins/default/xui/en/widgets/combo_box.xml @@ -16,7 +16,9 @@ scale_image="true" pad_right="24" image_unselected="DropDown_Off" - image_selected="DropDown_Selected" + image_selected="DropDown_On" + image_pressed="DropDown_Press" + image_pressed_selected="DropDown_Press" image_disabled="DropDown_Disabled" /> <combo_box.combo_list bg_writeable_color="MenuDefaultBgColor" background_visible="true" diff --git a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml index ec8395a7c5..0e34243349 100644 --- a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml @@ -2,7 +2,7 @@ <filter_editor clear_button_visible="true" search_button_visible="true" - text_pad_left="5" + text_pad_left="7" select_on_focus="true" background_image="TextField_Search_Off" background_image_disabled="TextField_Search_Disabled" diff --git a/indra/newview/skins/default/xui/en/widgets/floater.xml b/indra/newview/skins/default/xui/en/widgets/floater.xml index 6660fbf1a8..2263866471 100644 --- a/indra/newview/skins/default/xui/en/widgets/floater.xml +++ b/indra/newview/skins/default/xui/en/widgets/floater.xml @@ -7,4 +7,19 @@ bg_alpha_image="Window_Background" background_visible="true" background_opaque="false" - header_height="25" /> + header_height="25" + close_image="Icon_Close_Foreground" + restore_image="Icon_Restore_Foreground" + minimize_image="Icon_Minimize_Foreground" + tear_off_image="tearoffbox.tga" + dock_image="Icon_Dock_Foreground" + undock_image="Icon_Undock_Foreground" + help_image="Icon_Help_Foreground" + close_pressed_image="Icon_Close_Press" + restore_pressed_image="Icon_Restore_Press" + minimize_pressed_image="Icon_Minimize_Press" + tear_off_pressed_image="tearoff_pressed.tga" + dock_pressed_image="Icon_Dock_Press" + undock_pressed_image="Icon_Undock_Press" + help_pressed_image="Icon_Help_Press" + /> diff --git a/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml b/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml index 6171be034f..4229f34c09 100644 --- a/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml +++ b/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<gesture_combo_box font="SansSerifSmall" +<gesture_combo_box label="Gestures" list_position="below" max_chars="20" @@ -7,7 +7,6 @@ <gesture_combo_box.combo_button name="Combobox Button" label="" hover_glow_amount="0.15" - font="SansSerifSmall" scale_image="true" image_unselected="ComboButton_Off" image_selected="ComboButton_Selected" @@ -17,15 +16,15 @@ label="" halign="center" hover_glow_amount="0.15" - font="SansSerif" scale_image="true" + image_selected="PushButton_Selected_Press" + image_pressed="PushButton_Press" + image_pressed_selected="PushButton_Selected_Press" image_unselected="PushButton_Off" - image_selected="PushButton_Selected" image_disabled="PushButton_Disabled" image_disabled_selected="PushButton_Selected_Disabled" /> <gesture_combo_box.combo_list bg_writeable_color="MenuDefaultBgColor" - scroll_bar_bg_visible="true" /> + scroll_bar_bg_visible="false" /> <gesture_combo_box.combo_editor name="Combo Text Entry" - select_on_focus="true" - font="SansSerifSmall" /> + select_on_focus="true" /> </gesture_combo_box> diff --git a/indra/newview/skins/default/xui/en/widgets/inspector.xml b/indra/newview/skins/default/xui/en/widgets/inspector.xml index 61950d7554..8ec206023e 100644 --- a/indra/newview/skins/default/xui/en/widgets/inspector.xml +++ b/indra/newview/skins/default/xui/en/widgets/inspector.xml @@ -1,8 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <!-- See also settings.xml UIFloater* settings for configuration --> <inspector name="inspector" - bg_opaque_color="ToolTipBgColor" + bg_opaque_color="DkGray_66" background_visible="true" bg_opaque_image="none" + background_opaque="true" bg_alpha_image="none" + text_color="InspectorTipTextColor" /> diff --git a/indra/newview/skins/default/xui/en/widgets/line_editor.xml b/indra/newview/skins/default/xui/en/widgets/line_editor.xml index 546fbd9b47..a21e3f2645 100644 --- a/indra/newview/skins/default/xui/en/widgets/line_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/line_editor.xml @@ -8,6 +8,7 @@ ignore_tab="true" cursor_color="TextCursorColor" text_color="TextFgColor" + text_pad_left="2" text_readonly_color="TextFgReadOnlyColor" text_tentative_color="TextFgTentativeColor" highlight_color="EmphasisColor" diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml index d88bcfab1d..90887dead6 100644 --- a/indra/newview/skins/default/xui/en/widgets/location_input.xml +++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml @@ -11,7 +11,8 @@ add_landmark_image_disabled="Favorite_Star_Off" add_landmark_image_hover="Favorite_Star_Over" add_landmark_image_selected="Favorite_Star_Press" - add_landmark_hpad="2" + add_landmark_hpad="10" + icon_hpad="2" allow_text_entry="true" list_position="below" show_text_as_tentative="false" @@ -38,13 +39,76 @@ scale_image="false" top="19" left="-3" /> + <for_sale_button + name="for_sale_btn" + image_unselected="parcel_lght_ForSale" + width="22" + height="18" + follows="right|top" + scale_image="false" + top="21" + /> + <voice_icon + name="voice_icon" + width="22" + height="18" + top="21" + image_name="parcel_lght_VoiceNo" + /> + <fly_icon + name="fly_icon" + width="22" + height="18" + top="21" + image_name="parcel_lght_FlyNo" + /> + <push_icon + name="push_icon" + width="22" + height="18" + top="21" + image_name="parcel_lght_PushNo" + /> + <build_icon + name="build_icon" + width="22" + height="18" + top="21" + image_name="parcel_lght_BuildNo" + /> + <scripts_icon + name="scripts_icon" + width="22" + height="18" + top="21" + image_name="parcel_lght_ScriptsNo" + /> + <!-- NOTE: Placeholder icon, there is no dark grayscale version --> + <damage_icon + name="damage_icon" + width="22" + height="18" + top="21" + image_name="parcel_lght_Damage" + /> + <!-- Default text color is invisible on top of nav bar background --> + <damage_text + name="damage_text" + width="35" + height="18" + top="16" + halign="right" + font="SansSerifSmall" + text_color="TextFgColor" + /> + <combo_button name="Location History" label="" pad_right="0"/> <combo_list bg_writeable_color="MenuDefaultBgColor" page_lines="10" scroll_bar_bg_visible="true" /> <combo_editor name="Combo Text Entry" - text_pad_left="20" + text_pad_left="22" select_on_focus="false" font="SansSerifSmall" bevel_style="none" diff --git a/indra/newview/skins/default/xui/en/widgets/menu_item.xml b/indra/newview/skins/default/xui/en/widgets/menu_item.xml index c98e9cb6b8..2bbaa6233f 100644 --- a/indra/newview/skins/default/xui/en/widgets/menu_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/menu_item.xml @@ -1,6 +1,4 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <!-- Use this for the top-level menu styling --> -<menu_item - font="SansSerifSmall" - > +<menu_item> </menu_item> diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml b/indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml index 0794b49a0c..f936a1e208 100644 --- a/indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml +++ b/indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<scroll_column_header image_unselected="square_btn_32x128.tga" - image_selected="square_btn_selected_32x128.tga" - image_disabled="square_btn_32x128.tga" - image_disabled_selected="square_btn_selected_32x128.tga" - image_overlay="combobox_arrow.tga" +<scroll_column_header + image_unselected="SegmentedBtn_Middle_Selected" + image_selected="SegmentedBtn_Middle_Selected" + image_pressed="SegmentedBtn_Middle_Selected_Press" + image_disabled="SegmentedBtn_Middle_Disabled" + image_disabled_selected="SegmentedBtn_Middle_Selected_Disabled" + image_overlay="DisclosureArrow_Opened_Off" image_overlay_alignment="right" halign="left" - scale_image="true"/> + scale_image="true" /> diff --git a/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml b/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml index 56204201ef..c2a70d4b39 100644 --- a/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml +++ b/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml @@ -13,7 +13,7 @@ <combo_editor name="child1" select_on_focus="true" - text_pad_left="28" + text_pad_left="30" background_image="TextField_Search_Off" background_image_disabled="TextField_Search_Disabled" background_image_focused="TextField_Search_Active"/> diff --git a/indra/newview/skins/default/xui/en/widgets/search_editor.xml b/indra/newview/skins/default/xui/en/widgets/search_editor.xml index 9a79243b03..f644a710b2 100644 --- a/indra/newview/skins/default/xui/en/widgets/search_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/search_editor.xml @@ -2,7 +2,7 @@ <search_editor clear_button_visible="false" search_button_visible="true" - text_pad_left="4" + text_pad_left="6" select_on_focus="true" background_image="TextField_Search_Off" background_image_disabled="TextField_Search_Disabled" diff --git a/indra/newview/skins/default/xui/en/widgets/tab_container.xml b/indra/newview/skins/default/xui/en/widgets/tab_container.xml index f1401140de..477c6fb8b8 100644 --- a/indra/newview/skins/default/xui/en/widgets/tab_container.xml +++ b/indra/newview/skins/default/xui/en/widgets/tab_container.xml @@ -2,7 +2,7 @@ <tab_container tab_min_width="60" tab_max_width="150" font_halign="center" - font="SansSerif" + font="SansSerifSmall" tab_height="21"> <first_tab tab_top_image_unselected="TabTop_Left_Off" tab_top_image_selected="TabTop_Left_Selected" diff --git a/indra/newview/skins/default/xui/en/widgets/talk_button.xml b/indra/newview/skins/default/xui/en/widgets/talk_button.xml index 1d8257fbc8..7781bdd066 100644 --- a/indra/newview/skins/default/xui/en/widgets/talk_button.xml +++ b/indra/newview/skins/default/xui/en/widgets/talk_button.xml @@ -6,13 +6,18 @@ image_unselected="SegmentedBtn_Left_Off" --> <speak_button + follows="left|right" + image_selected="SegmentedBtn_Left_Selected_Press" + image_unselected="SegmentedBtn_Left_Off" + image_pressed="SegmentedBtn_Left_Selected_Press" + image_pressed_selected="SegmentedBtn_Left_Selected_Press" name="left" label="Speak" label_selected="Speak" - font="SansSerifSmall" tab_stop="false" /> <show_button + follows="right" name="right" label="" left="0" @@ -21,10 +26,14 @@ bottom="0" tab_stop="false" is_toggle="true" - image_selected="ComboButton_UpSelected" - image_unselected="ComboButton_UpOff" + image_selected="SegmentedBtn_Right_Selected_Press" + image_unselected="SegmentedBtn_Right_Off" + image_pressed="SegmentedBtn_Right_Press" + image_pressed_selected="SegmentedBtn_Right_Selected_Press" + image_overlay="Arrow_Small_Up" /> <monitor + follows="right" name="monitor" left="0" top="18" diff --git a/indra/newview/skins/default/xui/en/widgets/tool_tip.xml b/indra/newview/skins/default/xui/en/widgets/tool_tip.xml index 6b49f832fd..a19201f7c3 100644 --- a/indra/newview/skins/default/xui/en/widgets/tool_tip.xml +++ b/indra/newview/skins/default/xui/en/widgets/tool_tip.xml @@ -5,6 +5,8 @@ padding="4" wrap="true" font="SansSerif" - bg_opaque_color="ToolTipBgColor" + bg_opaque_image="Tooltip" + background_opaque="true" background_visible="true" + text_color="ToolTipTextColor" /> |