diff options
Diffstat (limited to 'indra/newview/skins/default')
74 files changed, 1267 insertions, 957 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index 91402acc0a..88e77f11ee 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -60,17 +60,14 @@ name="Red" value="1 0 0 1" /> <color - name="Green" - value="0 1 0 1" /> - <color name="Blue" value="0 0 1 1" /> <color name="Yellow" value="0.114 0.65 0.1" /> <color - name="Unused?" - value="1 0.5 0 1" /> + name="Green" + value="0 .39 .10 1" /> <color name="Transparent" value="0 0 0 0" /> @@ -435,7 +432,7 @@ reference="DkGray" /> <color name="MenuBarGodBgColor" - reference="DkGray2" /> + reference="Green" /> <color name="MenuDefaultBgColor" reference="DkGray2" /> @@ -687,5 +684,7 @@ <color name="ChatToastAgentNameColor" reference="EmphasisColor" /> - + <color + name="ColorSwatchBorderColor" + value="0.45098 0.517647 0.607843 1"/> </colors> diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 0317d55768..412f8b6d68 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -50,8 +50,10 @@ with the same filename but different name <texture name="Arrow_Right_Off" file_name="navbar/Arrow_Right_Off.png" preload="true" /> <texture name="Arrow_Right_Press" file_name="navbar/Arrow_Right_Press.png" preload="true" /> +<!-- <texture name="Arrow_Left" file_name="widgets/Arrow_Left.png" preload="true" /> <texture name="Arrow_Right" file_name="widgets/Arrow_Right.png" preload="true" /> +--> <texture name="Arrow_Small_Up" file_name="widgets/Arrow_Small_Up.png" preload="true" /> <texture name="Arrow_Small_Left" file_name="widgets/Arrow_Small_Left.png" preload="true" /> @@ -454,6 +456,7 @@ with the same filename but different name <texture name="SegmentedBtn_Left_Press" file_name="widgets/SegmentedBtn_Left_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" /> <texture name="SegmentedBtn_Left_Disabled" file_name="widgets/SegmentedBtn_Left_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" /> <texture name="SegmentedBtn_Left_Selected" file_name="widgets/SegmentedBtn_Left_Selected.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" /> + <texture name="SegmentedBtn_Left_Selected_Over" file_name="widgets/SegmentedBtn_Left_Selected_Over.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" /> <texture name="SegmentedBtn_Left_Selected_Press" file_name="widgets/SegmentedBtn_Left_Selected_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" /> <texture name="SegmentedBtn_Left_Selected_Disabled" file_name="widgets/SegmentedBtn_Left_Selected_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" /> 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 1239152c32..cc955369e2 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -4,6 +4,7 @@ height="420" layout="topleft" name="floaterland" + help_topic="floaterland" save_rect="true" title="ABOUT LAND" width="490"> @@ -274,7 +275,7 @@ <button enabled="false" follows="left|top" - height="23S" + height="23" label="Deed" layout="topleft" left_pad="2" @@ -472,6 +473,16 @@ top="328" width="100" /> <button + enabled="true" + follows="left|top" + height="23" + label="Script Info" + layout="topleft" + left="10" + name="Scripts..." + top="352" + width="100" /> + <button enabled="false" follows="left|top" height="23" @@ -1093,11 +1104,11 @@ <name_list.columns label="Count" name="count" - width="70" /> + width="60" /> <name_list.columns label="Most Recent" name="mostrecent" - width="160" /> + width="170" /> </name_list> </panel> <panel @@ -1672,9 +1683,7 @@ Only large parcels can be listed in search. name="replace_texture_help" width="300" word_wrap="true"> - Objects using this texture will show the movie or web page after you click the play arrow. - -Select the thumbnail to choose a different texture. + Objects using this texture will show the movie or web page after you click the play arrow. Select the thumbnail to choose a different texture. </text> <check_box height="16" diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml index d378b427f1..a797d54749 100644 --- a/indra/newview/skins/default/xui/en/floater_camera.xml +++ b/indra/newview/skins/default/xui/en/floater_camera.xml @@ -2,8 +2,8 @@ <floater legacy_header_height="18" can_dock="true" - can_minimize="false" - can_close="true" + can_minimize="true" + can_close="false" center_horiz="true" follows="bottom" height="152" @@ -108,7 +108,7 @@ image_unselected="Cam_Rotate_Out" layout="topleft" left="45" - mouse_opaque="false" + 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 275ab5bb8b..94686f0bb0 100644 --- a/indra/newview/skins/default/xui/en/floater_customize.xml +++ b/indra/newview/skins/default/xui/en/floater_customize.xml @@ -3,7 +3,7 @@ legacy_header_height="18" can_minimize="false" follows="left|top" - height="540" + height="607" layout="topleft" left_delta="-3" name="floater customize" @@ -11,30 +11,52 @@ save_rect="true" title="APPEARANCE" top_delta="-185" - width="494"> + width="524"> + <check_box + enabled="true" + height="23" + label="Show Attachments in Previews" + layout="topleft" + left="110" + name="show attachments" + tool_tip="Display attachments on your avatar in the preview panels below." + top="20" + width="146" /> <tab_container - height="483" + height="517" layout="topleft" - left="0" + left="10" name="customize tab container" tab_min_width="96" tab_position="left" - top="24" - width="492"> - <placeholder - label="Body Parts" - layout="topleft" - name="body_parts_placeholder" /> + tab_height="50" + top="50" + width="506"> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="5" + name="body_parts_placeholder" + font="SansSerifSmallBold" + top="10" + width="100"> + Body Parts + </text> + <placeholder /> <panel - border="true" + border="false" + background_visible="true" + bg_alpha_color="DkGray2" follows="left|top|right|bottom" - height="481" + height="508" label="Shape" layout="topleft" - left_delta="0" name="Shape" - top_delta="0" - width="389"> + help_topic="customize_shape_tab" + width="400"> <icon follows="top|right" height="18" @@ -47,134 +69,132 @@ width="18" /> <icon height="16" + top="10" + left="10" layout="topleft" - left_delta="-325" mouse_opaque="true" - top_delta="3" width="16" /> <button follows="right|bottom" - height="20" + height="23" label="Revert" label_selected="Revert" layout="topleft" - left="299" + right="390" name="Revert" - top="458" + top="477" width="82" /> <button follows="left|top" - height="16" + height="23" label="Body" label_selected="Body" layout="topleft" - left="8" + left="10" name="Body" - top="65" + top="63" width="82" /> <button follows="left|top" - height="16" + height="23" label="Head" label_selected="Head" layout="topleft" left_delta="0" name="Head" - top_pad="16" + top_pad="4" width="82" /> <button follows="left|top" - height="16" + height="23" label="Eyes" label_selected="Eyes" layout="topleft" left_delta="0" name="Eyes" - top_pad="16" + top_pad="4" width="82" /> <button follows="left|top" - height="16" + height="23" label="Ears" label_selected="Ears" layout="topleft" left_delta="0" name="Ears" - top_pad="16" + top_pad="4" width="82" /> <button follows="left|top" - height="16" + height="23" label="Nose" label_selected="Nose" layout="topleft" left_delta="0" name="Nose" - top_pad="16" + top_pad="4" width="82" /> <button follows="left|top" - height="16" + height="23" label="Mouth" label_selected="Mouth" layout="topleft" left_delta="0" name="Mouth" - top_pad="16" + top_pad="4" width="82" /> <button follows="left|top" - height="16" + height="23" label="Chin" label_selected="Chin" layout="topleft" left_delta="0" name="Chin" - top_pad="16" + top_pad="4" width="82" /> <button follows="left|top" - height="16" + height="23" label="Torso" label_selected="Torso" layout="topleft" left_delta="0" name="Torso" - top_pad="16" + top_pad="4" width="82" /> <button follows="left|top" - height="16" + height="23" label="Legs" label_selected="Legs" layout="topleft" left_delta="0" name="Legs" - top_pad="16" + top_pad="4" width="82" /> <radio_group control_name="AvatarSex" height="34" layout="topleft" - left_delta="0" name="sex radio" - top_pad="16" + top_pad="10" width="82"> <radio_item height="16" label="Female" layout="topleft" - left="1" name="radio" - top="1" + value="0" width="82" /> <radio_item height="16" label="Male" layout="topleft" - left_delta="0" name="radio2" - top_delta="16" + value="1" + top="32" width="82" /> </radio_group> <text @@ -184,9 +204,9 @@ font="SansSerif" height="16" layout="topleft" - left="8" + left="31" name="title" - top="8" + top="10" width="355"> [DESC] </text> @@ -197,9 +217,9 @@ font="SansSerif" height="16" layout="topleft" - left_delta="0" + left="31" name="title_no_modify" - top_delta="0" + top="10" width="355"> [DESC]: cannot modify </text> @@ -210,9 +230,9 @@ font="SansSerif" height="16" layout="topleft" - left_delta="0" + left="31" name="title_loading" - top_delta="0" + top="10" width="355"> [DESC]: loading... </text> @@ -223,9 +243,9 @@ font="SansSerif" height="16" layout="topleft" - left_delta="0" + left="31" name="title_not_worn" - top_delta="0" + top="10" width="355"> [DESC]: not worn </text> @@ -233,11 +253,11 @@ type="string" length="1" follows="left|top" - height="14" + height="16" layout="topleft" - left="8" + left="10" name="path" - top="24" + top="36" width="373"> Located in [PATH] </text> @@ -247,9 +267,9 @@ follows="left|top|right" height="28" layout="topleft" - left_delta="0" + left="10" name="not worn instructions" - top_pad="8" + top="31" width="373"> Put on a new shape by dragging one from your inventory to your avatar. Alternately, you create a new one from @@ -270,58 +290,59 @@ scratch and wear it. <text type="string" length="1" - bottom="486" + top="488" follows="left|top|right" font="SansSerif" halign="right" - height="28" + height="23" layout="topleft" name="Item Action Label" - right="117" + right="132" width="100"> Shape: </text> <button follows="left|top" - height="24" + height="23" label="Create New Shape" label_selected="Create New Shape" layout="topleft" - left="8" + left="10" name="Create New" top="104" width="140" /> <button follows="right|bottom" - height="20" + height="23" label="Save" label_selected="Save" layout="topleft" - left="123" name="Save" - top="458" + right="218" + top="477" width="82" /> <button follows="right|bottom" - height="20" + height="23" label="Save As..." label_selected="Save As..." layout="topleft" - left_pad="6" name="Save As" - top_delta="0" + top="477" + right="304" width="82" /> </panel> <panel - border="true" + border="false" + background_visible="true" + bg_alpha_color="DkGray2" follows="left|top|right|bottom" - height="481" + height="508" label="Skin" layout="topleft" - left_delta="0" name="Skin" - top_delta="0" - width="389"> + help_topic="customize_skin_tab" + width="400"> <icon follows="top|right" height="18" @@ -333,52 +354,51 @@ scratch and wear it. top="4" width="18" /> <icon - follows="left|top" height="16" + top="10" + left="10" layout="topleft" - left="8" mouse_opaque="true" - top_delta="3" width="16" /> <button follows="left|top" - height="16" + height="23" label="Skin Color" label_selected="Skin Color" layout="topleft" - left_delta="0" + left="10" name="Skin Color" - top_pad="41" + top="63" width="82" /> <button follows="left|top" - height="16" + height="23" label="Face Detail" label_selected="Face Detail" layout="topleft" left_delta="0" name="Face Detail" - top_pad="16" + top_pad="4" width="82" /> <button follows="left|top" - height="16" + height="23" label="Makeup" label_selected="Makeup" layout="topleft" left_delta="0" name="Makeup" - top_pad="16" + top_pad="4" width="82" /> <button follows="left|top" - height="16" + height="23" label="Body Detail" label_selected="Body Detail" layout="topleft" left_delta="0" name="Body Detail" - top_pad="16" + top_pad="4" width="82" /> <text type="string" @@ -387,9 +407,9 @@ scratch and wear it. font="SansSerif" height="16" layout="topleft" - left="8" + left="31" name="title" - top="8" + top="10" width="355"> [DESC] </text> @@ -400,9 +420,9 @@ scratch and wear it. font="SansSerif" height="16" layout="topleft" - left_delta="0" + left="31" name="title_no_modify" - top_delta="0" + top="10" width="355"> [DESC]: cannot modify </text> @@ -413,9 +433,9 @@ scratch and wear it. font="SansSerif" height="16" layout="topleft" - left_delta="0" + left="31" name="title_loading" - top_delta="0" + top="10" width="355"> [DESC]: loading... </text> @@ -426,9 +446,9 @@ scratch and wear it. font="SansSerif" height="16" layout="topleft" - left_delta="0" + left="31" name="title_not_worn" - top_delta="0" + top="10" width="355"> [DESC]: not worn </text> @@ -438,9 +458,9 @@ scratch and wear it. follows="left|top|right" height="14" layout="topleft" - left="8" + left="10" name="path" - top="24" + top="36" width="373"> Located in [PATH] </text> @@ -450,9 +470,9 @@ scratch and wear it. follows="left|top|right" height="28" layout="topleft" - left_delta="0" + left="10" name="not worn instructions" - top_pad="8" + top="31" width="373"> Put on a new skin by dragging one from your inventory to your avatar. Alternately, you create a new one from @@ -473,14 +493,14 @@ scratch and wear it. <text type="string" length="1" - bottom="486" + top="488" follows="left|top|right" font="SansSerif" halign="right" - height="28" + height="23" layout="topleft" name="Item Action Label" - right="117" + right="132" width="100"> Skin: </text> @@ -489,43 +509,43 @@ scratch and wear it. can_apply_immediately="true" default_image_name="Default" follows="left|top" - height="80" + height="108" label="Head Tattoos" layout="topleft" - left="8" + left="10" name="Head Tattoos" tool_tip="Click to choose a picture" - top="193" - width="74" /> + top="176" + width="82" /> <texture_picker allow_no_texture="true" can_apply_immediately="true" default_image_name="Default" follows="left|top" - height="80" + height="108" label="Upper Tattoos" layout="topleft" left_delta="0" name="Upper Tattoos" tool_tip="Click to choose a picture" - top_delta="80" - width="74" /> + top_delta="102" + width="82" /> <texture_picker allow_no_texture="true" can_apply_immediately="true" default_image_name="Default" follows="left|top" - height="80" + height="108" label="Lower Tattoos" layout="topleft" left_delta="0" name="Lower Tattoos" tool_tip="Click to choose a picture" - top_delta="80" - width="74" /> + top_delta="102" + width="82" /> <button follows="left|top" - height="24" + height="23" label="Create New Skin" label_selected="Create New Skin" layout="topleft" @@ -535,45 +555,46 @@ scratch and wear it. width="120" /> <button follows="right|bottom" - height="20" + height="23" label="Save" label_selected="Save" layout="topleft" - left="123" + right="218" name="Save" - top="458" + top="477" width="82" /> <button follows="right|bottom" - height="20" + height="23" label="Save As..." label_selected="Save As..." layout="topleft" - left_pad="6" + right="304" name="Save As" - top_delta="0" + top="477" width="82" /> <button follows="right|bottom" - height="20" + height="23" label="Revert" label_selected="Revert" layout="topleft" - left_pad="6" + right="390" name="Revert" - top_delta="0" + top="477" width="82" /> </panel> <panel - border="true" + border="false" + background_visible="true" + bg_alpha_color="DkGray2" follows="left|top|right|bottom" - height="481" + height="508" label="Hair" layout="topleft" - left_delta="0" name="Hair" - top_delta="0" - width="389"> + help_topic="customize_hair_tab" + width="400"> <icon follows="top|right" height="18" @@ -586,50 +607,48 @@ scratch and wear it. width="18" /> <icon height="16" + top="10" + left="10" layout="topleft" - left="8" mouse_opaque="true" - top_delta="3" width="16" /> <button follows="left|top" - height="16" + height="23" label="Color" label_selected="Color" layout="topleft" - left_delta="0" + left="10" name="Color" - top_pad="41" + top="63" width="82" /> <button follows="left|top" - height="16" + height="23" label="Style" label_selected="Style" layout="topleft" left_delta="0" name="Style" - top_pad="16" + top_pad="4" width="82" /> <button follows="left|top" - height="16" + height="23" label="Eyebrows" label_selected="Eyebrows" layout="topleft" - left_delta="0" name="Eyebrows" - top_pad="16" + top_pad="4" width="82" /> <button follows="left|top" - height="16" + height="23" label="Facial" label_selected="Facial" layout="topleft" - left_delta="0" name="Facial" - top_pad="16" + top_pad="4" width="82" /> <text type="string" @@ -638,9 +657,9 @@ scratch and wear it. font="SansSerif" height="16" layout="topleft" - left="8" + left="31" name="title" - top="8" + top="10" width="355"> [DESC] </text> @@ -651,9 +670,9 @@ scratch and wear it. font="SansSerif" height="16" layout="topleft" - left_delta="0" + left="31" name="title_no_modify" - top_delta="0" + top="10" width="355"> [DESC]: cannot modify </text> @@ -664,9 +683,9 @@ scratch and wear it. font="SansSerif" height="16" layout="topleft" - left_delta="0" + left="31" name="title_loading" - top_delta="0" + top="10" width="355"> [DESC]: loading... </text> @@ -677,9 +696,9 @@ scratch and wear it. font="SansSerif" height="16" layout="topleft" - left_delta="0" + left="31" name="title_not_worn" - top_delta="0" + top="10" width="355"> [DESC]: not worn </text> @@ -689,9 +708,9 @@ scratch and wear it. follows="left|top|right" height="14" layout="topleft" - left="8" + left="10" name="path" - top="24" + top="36" width="373"> Located in [PATH] </text> @@ -701,9 +720,9 @@ scratch and wear it. follows="left|top|right" height="28" layout="topleft" - left_delta="0" + left="10" name="not worn instructions" - top_pad="8" + top="31" width="373"> Put on a new hair by dragging one from your inventory to your avatar. Alternately, you create a new one from @@ -724,14 +743,14 @@ scratch and wear it. <text type="string" length="1" - bottom="486" + top="488" follows="left|top|right" font="SansSerif" halign="right" - height="28" + height="23" layout="topleft" name="Item Action Label" - right="117" + right="132" width="100"> Hair: </text> @@ -739,17 +758,17 @@ scratch and wear it. can_apply_immediately="true" default_image_name="Default" follows="left|top" - height="80" + height="108" label="Texture" layout="topleft" - left="8" + left="10" name="Texture" tool_tip="Click to choose a picture" - top="193" - width="64" /> + top="176" + width="82" /> <button follows="left|top" - height="24" + height="23" label="Create New Hair" label_selected="Create New Hair" layout="topleft" @@ -759,33 +778,33 @@ scratch and wear it. width="120" /> <button follows="right|bottom" - height="20" + height="23" label="Save" label_selected="Save" layout="topleft" - left="123" + right="218" name="Save" - top="458" + top="477" width="82" /> <button follows="right|bottom" - height="20" + height="23" label="Save As..." label_selected="Save As..." layout="topleft" - left_pad="6" + right="304" name="Save As" - top_delta="0" + top="477" width="82" /> <button follows="right|bottom" - height="20" + height="23" label="Revert" label_selected="Revert" layout="topleft" - left_pad="6" + right="390" name="Revert" - top_delta="0" + top="477" width="82" /> </panel> <panel @@ -796,6 +815,7 @@ scratch and wear it. layout="topleft" left_delta="0" name="Eyes" + help_topic="customize_eyes_tab" top_delta="0" width="389"> <icon @@ -933,7 +953,7 @@ scratch and wear it. width="64" /> <button follows="left|top" - height="24" + height="23" label="Create New Eyes" label_selected="Create New Eyes" layout="topleft" @@ -943,7 +963,7 @@ scratch and wear it. width="120" /> <button follows="right|bottom" - height="20" + height="23" label="Save" label_selected="Save" layout="topleft" @@ -953,7 +973,7 @@ scratch and wear it. width="82" /> <button follows="right|bottom" - height="20" + height="23" label="Save As..." label_selected="Save As..." layout="topleft" @@ -963,7 +983,7 @@ scratch and wear it. width="82" /> <button follows="right|bottom" - height="20" + height="23" label="Revert" label_selected="Revert" layout="topleft" @@ -972,10 +992,20 @@ scratch and wear it. top_delta="0" width="82" /> </panel> - <placeholder - label="Clothes" - layout="topleft" - name="clothes_placeholder" /> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="5" + name="clothes_placeholder" + font="SansSerifSmallBold" + top="125" + width="100"> + Clothes + </text> + <placeholder /> <panel border="true" follows="left|top|right|bottom" @@ -984,6 +1014,7 @@ scratch and wear it. layout="topleft" left_delta="0" name="Shirt" + help_topic="customize_shirt_tab" top_delta="0" width="389"> <icon @@ -1016,7 +1047,6 @@ scratch and wear it. top_pad="41" width="64" /> <color_swatch - border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" follows="left|top" height="80" @@ -1029,7 +1059,7 @@ scratch and wear it. width="64" /> <button follows="left|top" - height="24" + height="23" label="Create New Shirt" label_selected="Create New Shirt" layout="topleft" @@ -1039,7 +1069,7 @@ scratch and wear it. width="120" /> <button follows="left|top" - height="20" + height="23" label="Take Off" label_selected="Take Off" layout="topleft" @@ -1049,7 +1079,7 @@ scratch and wear it. width="82" /> <button follows="right|bottom" - height="20" + height="23" label="Save" label_selected="Save" layout="topleft" @@ -1059,7 +1089,7 @@ scratch and wear it. width="82" /> <button follows="right|bottom" - height="20" + height="23" label="Save As..." label_selected="Save As..." layout="topleft" @@ -1069,7 +1099,7 @@ scratch and wear it. width="82" /> <button follows="right|bottom" - height="20" + height="23" label="Revert" label_selected="Revert" layout="topleft" @@ -1190,6 +1220,7 @@ scratch and wear it. layout="topleft" left_delta="0" name="Pants" + help_topic="customize_pants_tab" top_delta="0" width="389"> <icon @@ -1222,7 +1253,6 @@ scratch and wear it. top_pad="41" width="64" /> <color_swatch - border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" follows="left|top" height="80" @@ -1235,7 +1265,7 @@ scratch and wear it. width="64" /> <button follows="left|top" - height="24" + height="23" label="Create New Pants" label_selected="Create New Pants" layout="topleft" @@ -1245,7 +1275,7 @@ scratch and wear it. width="120" /> <button follows="left|top" - height="20" + height="23" label="Take Off" label_selected="Take Off" layout="topleft" @@ -1255,7 +1285,7 @@ scratch and wear it. width="82" /> <button follows="right|bottom" - height="20" + height="23" label="Save" label_selected="Save" layout="topleft" @@ -1265,7 +1295,7 @@ scratch and wear it. width="82" /> <button follows="right|bottom" - height="20" + height="23" label="Save As..." label_selected="Save As..." layout="topleft" @@ -1275,7 +1305,7 @@ scratch and wear it. width="82" /> <button follows="right|bottom" - height="20" + height="23" label="Revert" label_selected="Revert" layout="topleft" @@ -1396,6 +1426,7 @@ scratch and wear it. layout="topleft" left_delta="0" name="Shoes" + help_topic="customize_shoes_tab" top_delta="0" width="389"> <icon @@ -1532,7 +1563,6 @@ scratch and wear it. top="65" width="64" /> <color_swatch - border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" follows="left|top" height="80" @@ -1545,7 +1575,7 @@ scratch and wear it. width="64" /> <button follows="left|top" - height="24" + height="23" label="Create New Shoes" label_selected="Create New Shoes" layout="topleft" @@ -1555,7 +1585,7 @@ scratch and wear it. width="120" /> <button follows="left|top" - height="20" + height="23" label="Take Off" label_selected="Take Off" layout="topleft" @@ -1565,7 +1595,7 @@ scratch and wear it. width="82" /> <button follows="right|bottom" - height="20" + height="23" label="Save" label_selected="Save" layout="topleft" @@ -1575,7 +1605,7 @@ scratch and wear it. width="82" /> <button follows="right|bottom" - height="20" + height="23" label="Save As..." label_selected="Save As..." layout="topleft" @@ -1585,7 +1615,7 @@ scratch and wear it. width="82" /> <button follows="right|bottom" - height="20" + height="23" label="Revert" label_selected="Revert" layout="topleft" @@ -1602,6 +1632,7 @@ scratch and wear it. layout="topleft" left_delta="0" name="Socks" + help_topic="customize_socks_tab" top_delta="0" width="389"> <icon @@ -1738,7 +1769,6 @@ scratch and wear it. top="65" width="64" /> <color_swatch - border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" follows="left|top" height="80" @@ -1751,7 +1781,7 @@ scratch and wear it. width="64" /> <button follows="left|top" - height="24" + height="23" label="Create New Socks" label_selected="Create New Socks" layout="topleft" @@ -1761,7 +1791,7 @@ scratch and wear it. width="120" /> <button follows="left|top" - height="20" + height="23" label="Take Off" label_selected="Take Off" layout="topleft" @@ -1771,7 +1801,7 @@ scratch and wear it. width="82" /> <button follows="right|bottom" - height="20" + height="23" label="Save" label_selected="Save" layout="topleft" @@ -1781,7 +1811,7 @@ scratch and wear it. width="82" /> <button follows="right|bottom" - height="20" + height="23" label="Save As..." label_selected="Save As..." layout="topleft" @@ -1791,7 +1821,7 @@ scratch and wear it. width="82" /> <button follows="right|bottom" - height="20" + height="23" label="Revert" label_selected="Revert" layout="topleft" @@ -1808,6 +1838,7 @@ scratch and wear it. layout="topleft" left_delta="0" name="Jacket" + help_topic="customize_jacket_tab" top_delta="0" width="389"> <icon @@ -1956,7 +1987,6 @@ scratch and wear it. top_delta="80" width="64" /> <color_swatch - border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" follows="left|top" height="80" @@ -1969,7 +1999,7 @@ scratch and wear it. width="64" /> <button follows="left|top" - height="24" + height="23" label="Create New Jacket" label_selected="Create New Jacket" layout="topleft" @@ -1979,7 +2009,7 @@ scratch and wear it. width="140" /> <button follows="left|top" - height="20" + height="23" label="Take Off" label_selected="Take Off" layout="topleft" @@ -1989,7 +2019,7 @@ scratch and wear it. width="82" /> <button follows="right|bottom" - height="20" + height="23" label="Save" label_selected="Save" layout="topleft" @@ -1999,7 +2029,7 @@ scratch and wear it. width="82" /> <button follows="right|bottom" - height="20" + height="23" label="Save As..." label_selected="Save As..." layout="topleft" @@ -2009,7 +2039,7 @@ scratch and wear it. width="82" /> <button follows="right|bottom" - height="20" + height="23" label="Revert" label_selected="Revert" layout="topleft" @@ -2026,6 +2056,7 @@ scratch and wear it. layout="topleft" left_delta="0" name="Gloves" + help_topic="customize_gloves_tab" top_delta="0" width="389"> <icon @@ -2162,7 +2193,6 @@ scratch and wear it. top="65" width="64" /> <color_swatch - border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" follows="left|top" height="80" @@ -2175,7 +2205,7 @@ scratch and wear it. width="64" /> <button follows="left|top" - height="24" + height="23" label="Create New Gloves" label_selected="Create New Gloves" layout="topleft" @@ -2185,7 +2215,7 @@ scratch and wear it. width="130" /> <button follows="left|top" - height="20" + height="23" label="Take Off" label_selected="Take Off" layout="topleft" @@ -2195,7 +2225,7 @@ scratch and wear it. width="82" /> <button follows="right|bottom" - height="20" + height="23" label="Save" label_selected="Save" layout="topleft" @@ -2205,7 +2235,7 @@ scratch and wear it. width="82" /> <button follows="right|bottom" - height="20" + height="23" label="Save As..." label_selected="Save As..." layout="topleft" @@ -2215,7 +2245,7 @@ scratch and wear it. width="82" /> <button follows="right|bottom" - height="20" + height="23" label="Revert" label_selected="Revert" layout="topleft" @@ -2232,6 +2262,7 @@ scratch and wear it. layout="topleft" left_delta="0" name="Undershirt" + help_topic="customize_undershirt_tab" top_delta="0" width="389"> <icon @@ -2368,7 +2399,6 @@ scratch and wear it. top="65" width="64" /> <color_swatch - border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" follows="left|top" height="80" @@ -2381,7 +2411,7 @@ scratch and wear it. width="64" /> <button follows="left|top" - height="24" + height="23" label="Create New Undershirt" label_selected="Create New Undershirt" layout="topleft" @@ -2391,7 +2421,7 @@ scratch and wear it. width="160" /> <button follows="left|top" - height="20" + height="23" label="Take Off" label_selected="Take Off" layout="topleft" @@ -2401,7 +2431,7 @@ scratch and wear it. width="82" /> <button follows="right|bottom" - height="20" + height="23" label="Save" label_selected="Save" layout="topleft" @@ -2411,7 +2441,7 @@ scratch and wear it. width="82" /> <button follows="right|bottom" - height="20" + height="23" label="Save As..." label_selected="Save As..." layout="topleft" @@ -2421,7 +2451,7 @@ scratch and wear it. width="82" /> <button follows="right|bottom" - height="20" + height="23" label="Revert" label_selected="Revert" layout="topleft" @@ -2438,6 +2468,7 @@ scratch and wear it. layout="topleft" left_delta="0" name="Underpants" + help_topic="customize_underpants_tab" top_delta="0" width="389"> <icon @@ -2574,7 +2605,6 @@ scratch and wear it. top="65" width="64" /> <color_swatch - border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" follows="left|top" height="80" @@ -2587,7 +2617,7 @@ scratch and wear it. width="64" /> <button follows="left|top" - height="24" + height="23" label="Create New Underpants" label_selected="Create New Underpants" layout="topleft" @@ -2597,7 +2627,7 @@ scratch and wear it. width="160" /> <button follows="left|top" - height="20" + height="23" label="Take Off" label_selected="Take Off" layout="topleft" @@ -2607,7 +2637,7 @@ scratch and wear it. width="82" /> <button follows="right|bottom" - height="20" + height="23" label="Save" label_selected="Save" layout="topleft" @@ -2617,7 +2647,7 @@ scratch and wear it. width="82" /> <button follows="right|bottom" - height="20" + height="23" label="Save As..." label_selected="Save As..." layout="topleft" @@ -2627,7 +2657,7 @@ scratch and wear it. width="82" /> <button follows="right|bottom" - height="20" + height="23" label="Revert" label_selected="Revert" layout="topleft" @@ -2644,6 +2674,7 @@ scratch and wear it. layout="topleft" left_delta="0" name="Skirt" + help_topic="customize_skirt_tab" top_delta="0" width="389"> <icon @@ -2780,7 +2811,6 @@ scratch and wear it. top="65" width="64" /> <color_swatch - border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" follows="left|top" height="80" @@ -2793,7 +2823,7 @@ scratch and wear it. width="64" /> <button follows="left|top" - height="24" + height="23" label="Create New Skirt" label_selected="Create New Skirt" layout="topleft" @@ -2803,7 +2833,7 @@ scratch and wear it. width="120" /> <button follows="left|top" - height="20" + height="23" label="Take Off" label_selected="Take Off" layout="topleft" @@ -2813,7 +2843,7 @@ scratch and wear it. width="82" /> <button follows="right|bottom" - height="20" + height="23" label="Save" label_selected="Save" layout="topleft" @@ -2823,7 +2853,7 @@ scratch and wear it. width="82" /> <button follows="right|bottom" - height="20" + height="23" label="Save As..." label_selected="Save As..." layout="topleft" @@ -2833,7 +2863,7 @@ scratch and wear it. width="82" /> <button follows="right|bottom" - height="20" + height="23" label="Revert" label_selected="Revert" layout="topleft" @@ -2850,6 +2880,7 @@ scratch and wear it. layout="topleft" left_delta="0" name="Alpha" + help_topic="customize_alpha_tab" top_delta="0" width="389"> <icon @@ -3080,7 +3111,7 @@ scratch and wear it. width="16" /> <button follows="left|top" - height="24" + height="23" label="Create New Alpha" label_selected="Create New Alpha" layout="topleft" @@ -3090,7 +3121,7 @@ scratch and wear it. width="120" /> <button follows="left|top" - height="20" + height="23" label="Take Off" label_selected="Take Off" layout="topleft" @@ -3100,7 +3131,7 @@ scratch and wear it. width="82" /> <button follows="right|bottom" - height="20" + height="23" label="Save" label_selected="Save" layout="topleft" @@ -3110,7 +3141,7 @@ scratch and wear it. width="82" /> <button follows="right|bottom" - height="20" + height="23" label="Save As..." label_selected="Save As..." layout="topleft" @@ -3120,7 +3151,7 @@ scratch and wear it. width="82" /> <button follows="right|bottom" - height="20" + height="23" label="Revert" label_selected="Revert" layout="topleft" @@ -3137,6 +3168,7 @@ scratch and wear it. layout="topleft" left_delta="0" name="Tattoo" + help_topic="customize_tattoo_tab" top_delta="0" width="389"> <icon @@ -3298,7 +3330,7 @@ scratch and wear it. width="64" /> <button follows="left|top" - height="24" + height="23" label="Create New Tattoo" label_selected="Create New Tattoo" layout="topleft" @@ -3308,7 +3340,7 @@ scratch and wear it. width="120" /> <button follows="left|top" - height="20" + height="23" label="Take Off" label_selected="Take Off" layout="topleft" @@ -3318,7 +3350,7 @@ scratch and wear it. width="82" /> <button follows="right|bottom" - height="20" + height="23" label="Save" label_selected="Save" layout="topleft" @@ -3328,7 +3360,7 @@ scratch and wear it. width="82" /> <button follows="right|bottom" - height="20" + height="23" label="Save As..." label_selected="Save As..." layout="topleft" @@ -3338,7 +3370,7 @@ scratch and wear it. width="82" /> <button follows="right|bottom" - height="20" + height="23" label="Revert" label_selected="Revert" layout="topleft" @@ -3350,12 +3382,12 @@ scratch and wear it. </tab_container> <scroll_container follows="left|top|right|bottom" - height="382" + height="409" layout="topleft" - left="197" + left="211" mouse_opaque="false" name="panel_container" - top="94" + top="116" width="292"> <scrolling_panel_list follows="left|bottom" @@ -3363,19 +3395,29 @@ scratch and wear it. name="panel_list" /> </scroll_container> <button - bottom="536" - follows="right|bottom" + bottom="598" + follows="right|left" height="20" + label="Script Info" + label_selected="Script Info" + layout="topleft" + name="script_info" + left="2" + width="98" /> + <button + bottom="598" + follows="right|bottom" + height="23" label="Make Outfit" label_selected="Make Outfit" layout="topleft" name="make_outfit_btn" - right="-216" + right="-218" width="100" /> <button - bottom="536" + bottom="598" follows="right|bottom" - height="20" + height="23" label="Cancel" label_selected="Cancel" layout="topleft" @@ -3383,13 +3425,13 @@ scratch and wear it. right="-10" width="100" /> <button - bottom="536" + bottom="598" follows="right|bottom" - height="20" + height="23" label="OK" label_selected="OK" layout="topleft" name="Ok" - right="-116" + right="-114" width="100" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml index 35f3e643c3..8c5af2283d 100644 --- a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml +++ b/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml @@ -65,11 +65,9 @@ <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="WL12am" follows="left|top|right" - height="6" + height="16" layout="topleft" left="8" name="WL12am" @@ -80,11 +78,9 @@ <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="WL3am" follows="left|top|right" - height="6" + height="16" layout="topleft" left_pad="10" name="WL3am" @@ -95,11 +91,9 @@ <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="WL6am" follows="left|top|right" - height="6" + height="16" layout="topleft" left_pad="10" name="WL6am" @@ -110,11 +104,9 @@ <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="WL9am" follows="left|top|right" - height="6" + height="16" layout="topleft" left_pad="10" name="WL9amHash" @@ -125,11 +117,9 @@ <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="WL12pm" follows="left|top|right" - height="6" + height="16" layout="topleft" left_pad="10" name="WL12pmHash" @@ -140,11 +130,9 @@ <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="WL3pm" follows="left|top|right" - height="6" + height="16" layout="topleft" left_pad="10" name="WL3pm" @@ -155,11 +143,9 @@ <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="WL6pm" follows="left|top|right" - height="6" + height="16" layout="topleft" left_pad="10" name="WL6pm" @@ -170,11 +156,9 @@ <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="WL9pm" follows="left|top|right" - height="6" + height="16" layout="topleft" left_pad="10" name="WL9pm" @@ -185,11 +169,9 @@ <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="WL12am2" follows="left|top|right" - height="6" + height="16" layout="topleft" left_pad="10" name="WL12am2" @@ -200,9 +182,7 @@ <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="WL12amHash" follows="left|top|right" font="SansSerif" height="14" @@ -210,135 +190,119 @@ left="20" name="WL12amHash" top="54" - width="4"> + width="6"> | </text> <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="WL3amHash" follows="left|top|right" font="SansSerif" height="11" layout="topleft" - left_pad="61" + left_pad="59" name="WL3amHash" top_delta="3" - width="4"> + width="6"> I </text> <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="WL6amHash" follows="left|top|right" font="SansSerif" height="14" layout="topleft" - left_pad="61" + left_pad="59" name="WL6amHash" top_delta="-3" - width="4"> + width="6"> | </text> <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="WL9amHash" follows="left|top|right" font="SansSerif" height="11" layout="topleft" - left_pad="61" + left_pad="59" name="WL9amHash2" top_delta="3" - width="4"> + width="6"> I </text> <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="WL12pmHash" follows="left|top|right" font="SansSerif" height="14" layout="topleft" - left_pad="61" + left_pad="59" name="WL12pmHash2" top_delta="-3" - width="4"> + width="6"> | </text> <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="WL3pmHash" follows="left|top|right" font="SansSerif" height="11" layout="topleft" - left_pad="61" + left_pad="59" name="WL3pmHash" top_delta="3" - width="4"> + width="6"> I </text> <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="WL6pmHash" follows="left|top|right" font="SansSerif" height="14" layout="topleft" - left_pad="61" + left_pad="59" name="WL6pmHash" top_delta="-3" - width="4"> + width="6"> | </text> <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="WL9pmHash" follows="left|top|right" font="SansSerif" height="11" layout="topleft" - left_pad="61" + left_pad="59" name="WL9pmHash" top_delta="3" - width="4"> + width="6"> I </text> <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="WL12amHash2" follows="left|top|right" font="SansSerif" height="14" layout="topleft" - left_pad="61" + left_pad="59" name="WL12amHash2" top_delta="-3" - width="4"> + width="6"> | </text> <button @@ -346,9 +310,9 @@ label="Add Key" label_selected="Add Key" layout="topleft" - left="550" + left="555" name="WLAddKey" - top="20" + top="30" width="80" /> <button height="20" @@ -362,9 +326,7 @@ <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="DayCycleText" follows="left|top|right" font="SansSerif" height="16" @@ -378,9 +340,7 @@ <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="DayCycleText" follows="left|top|right" font="SansSerif" height="16" @@ -424,9 +384,7 @@ <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="WLCurKeyTimeText" follows="left|top|right" font="SansSerif" height="16" @@ -456,9 +414,7 @@ <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="DayCycleText" follows="left|top|right" font="SansSerif" height="16" @@ -481,9 +437,7 @@ <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="DayCycleText" follows="left|top|right" font="SansSerif" height="16" @@ -542,9 +496,7 @@ <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="DayCycleText" follows="left|top|right" font="SansSerif" height="16" @@ -560,7 +512,7 @@ label="Play" label_selected="Play" layout="topleft" - left_delta="0" + left_delta="60" name="WLAnimSky" top_pad="5" width="50" /> @@ -581,7 +533,7 @@ left_pad="5" name="WLUseLindenTime" top_delta="0" - width="140" /> + width="150" /> <button height="20" label="Save Test Day" 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 5e78037ee1..8c87bd42dd 100644 --- a/indra/newview/skins/default/xui/en/floater_env_settings.xml +++ b/indra/newview/skins/default/xui/en/floater_env_settings.xml @@ -98,7 +98,6 @@ Water Color </text> <color_swatch - border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" color="0.5 0.5 0.5 1" follows="left|top" 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 156370a459..57e92cdeec 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -8,9 +8,9 @@ left="0" name="panel_im" top="0" - can_close="true" can_dock="false" - can_minimize="false" + can_minimize="true" + can_close="true" visible="true" width="360" can_resize="true" @@ -67,7 +67,7 @@ width="240"> </chat_history> <line_editor - bottom="0" + bottom="0" follows="left|right|bottom" font="SansSerifSmall" height="20" diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml index cff0c29dfc..0bdcbf30df 100644 --- a/indra/newview/skins/default/xui/en/floater_moveview.xml +++ b/indra/newview/skins/default/xui/en/floater_moveview.xml @@ -2,8 +2,8 @@ <floater legacy_header_height="18" can_dock="true" - can_close="true" - can_minimize="false" + can_minimize="true" + can_close="false" center_horiz="true" follows="bottom" height="110" @@ -38,12 +38,12 @@ Fly Backwards (press Down Arrow or S) </string> <panel - border="false" + border="false" height="83" - follows="left|top" + follows="left|top" layout="topleft" left="0" - mouse_opaque="false" + mouse_opaque="false" name="panel_actions" top="0" width="115"> @@ -130,7 +130,7 @@ </panel> <!-- Width and height of this panel should be synchronized with panel_stand_stop_flying.xml --> <panel - border="false" + border="false" height="27" layout="topleft" left="0" @@ -141,7 +141,7 @@ follows="left|bottom" height="23" image_overlay="Move_Walk_Off" - image_selected="PushButton_Selected_Press" + image_selected="PushButton_Selected_Press" label="" layout="topleft" name="mode_walk_btn" @@ -151,10 +151,10 @@ top="2" width="31" /> <button - follows="left|bottom" + follows="left|bottom" height="23" image_overlay="Move_Run_Off" - image_selected="PushButton_Selected_Press" + image_selected="PushButton_Selected_Press" label="" layout="topleft" left_pad="0" @@ -168,7 +168,7 @@ follows="left|bottom" height="23" image_overlay="Move_Fly_Off" - image_selected="PushButton_Selected_Press" + image_selected="PushButton_Selected_Press" label="" layout="topleft" left_pad="0" @@ -179,7 +179,7 @@ top="2" width="31" /> <button - visible="false" + visible="false" follows="left|bottom" height="20" label="Stop Flying" 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 c8aab2c1e0..fb8893678d 100644 --- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml +++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater - border_visible = "false" - border_drop_shadow_visible = "false" - drop_shadow_visible = "false" - border = "false" + border_visible="false" + border_drop_shadow_visible="false" + drop_shadow_visible="false" + border="false" bg_opaque_image="Inspector_Background" - bg_alpha_image="Toast_Background" + bg_alpha_image="Toast_Background" bg_alpha_color="0 0 0 0" legacy_header_height="18" - can_minimize="false" + can_minimize="true" can_tear_off="false" can_resize="true" can_drag_on_left="false" - can_close="true" + can_close="false" can_dock="true" bevel_style="in" height="300" @@ -29,10 +29,10 @@ bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" follows="all" - left="5" + left="5" top="20" layout="topleft" - height="275" + height="275" name="chat_history" parse_highlights="true" text_color="ChatHistoryTextColor" diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml index 2f26e5d0c1..15655a920e 100644 --- a/indra/newview/skins/default/xui/en/floater_preferences.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences.xml @@ -7,6 +7,7 @@ height="460" layout="topleft" name="Preferences" + help_topic="preferences" single_instance="true" title="PREFERENCES" width="620"> 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 8cc2c91ef5..3dc546aee3 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml @@ -39,6 +39,28 @@ name="Title"> Gesture: [NAME] </floater.string> + <text + type="string" + length="1" + follows="top|left" + font="SansSerifSmall" + height="10" + layout="topleft" + left="10" + name="name_text" + top="20" + font.style="BOLD" + width="100"> + Name: + </text> + <line_editor + follows="left|top" + height="20" + layout="topleft" + left_delta="84" + name="name" + top_delta="-4" + width="180" /> <text type="string" length="1" @@ -48,7 +70,7 @@ layout="topleft" left="10" name="desc_label" - top="25" + top_pad="10" font.style="BOLD" width="100"> Description: diff --git a/indra/newview/skins/default/xui/en/floater_preview_texture.xml b/indra/newview/skins/default/xui/en/floater_preview_texture.xml index abc30c335c..552902d1d9 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_texture.xml @@ -4,13 +4,13 @@ auto_tile="true" can_resize="true" follows="left|top" - height="313" + height="350" layout="topleft" - min_height="120" - min_width="320" + min_height="200" + min_width="370" name="preview_texture" help_topic="preview_texture" - width="320"> + width="370"> <floater.string name="Title"> Texture: [NAME] diff --git a/indra/newview/skins/default/xui/en/floater_script_limits.xml b/indra/newview/skins/default/xui/en/floater_script_limits.xml new file mode 100644 index 0000000000..98c44ad1b3 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_script_limits.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + height="570" + help_topic="scriptlimits" + layout="topleft" + name="scriptlimits" + save_rect="true" + title="SCRIPT INFORMATION" + width="480"> + <tab_container + bottom="555" + follows="left|right|top|bottom" + layout="topleft" + left="1" + name="scriptlimits_panels" + right="-1" + tab_position="top" + top="20" /> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml index 9c1a5499db..5a9e2ebe6e 100644 --- a/indra/newview/skins/default/xui/en/floater_search.xml +++ b/indra/newview/skins/default/xui/en/floater_search.xml @@ -4,8 +4,8 @@ can_resize="true" height="646" layout="topleft" - min_height="140" - min_width="467" + min_height="646" + min_width="670" name="floater_search" help_topic="floater_search" save_rect="true" 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 409f46b960..afc44c41b8 100644 --- a/indra/newview/skins/default/xui/en/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/en/floater_sell_land.xml @@ -2,7 +2,8 @@ <floater legacy_header_height="18" can_minimize="false" - height="450" + can_resize="true" + height="535" layout="topleft" name="sell land" help_topic="sell_land" @@ -12,7 +13,7 @@ <scroll_container color="DkGray2" follows="left|top|right|bottom" - height="435" + height="520" layout="topleft" name="profile_scroll" reserve_scroll_corner="true" @@ -31,63 +32,47 @@ enabled="false" follows="top|left" height="135" - layout="topleft" left="60" name="info_image" top="20" width="180" /> <text - type="string" - length="1" top="150" follows="top|left" - layout="topleft" left="16" name="info_parcel_label" width="48"> Parcel: </text> <text - type="string" - length="1" top_delta="0" follows="top|left" height="16" - layout="topleft" left="56" name="info_parcel" right="-20"> PARCEL NAME </text> <text - type="string" - length="1" follows="top|left" - layout="topleft" left="16" name="info_size_label" width="48"> Size: </text> <text - type="string" - length="1" follows="top|left" top_delta="0" height="32" - layout="topleft" left="56" name="info_size" right="-20"> [AREA] m² </text> <text - type="string" - length="1" follows="top|left" font="SansSerifBig" height="24" - layout="topleft" left="16" name="info_action" text_color="white" @@ -96,42 +81,30 @@ To sell this parcel: </text> <text - type="string" - length="1" follows="top|left" font="SansSerif" height="16" - layout="topleft" left="30" name="price_label"> 1. Set a price: </text> <text - type="string" - length="1" follows="top|left" height="16" - layout="topleft" left="40" name="price_text"> Choose an appropriate price. </text> <text - type="string" - length="1" height="16" - layout="topleft" left="40" name="price_ld" width="20"> L$ </text> <line_editor - type="string" - length="1" follows="top|left" height="18" - layout="topleft" left_delta="20" name="price" top_delta="0" @@ -139,10 +112,7 @@ 0 </line_editor> <text - type="string" - length="1" height="16" - layout="topleft" left="40" name="price_per_m" top_delta="25" @@ -150,22 +120,16 @@ (L$[PER_METER] per m²) </text> <text - type="string" - length="1" follows="top|left" font="SansSerif" height="16" - layout="topleft" left="30" name="sell_to_label"> 2. Sell the land to: </text> <text - type="string" - length="1" follows="top|left" height="25" - layout="topleft" left="40" word_wrap="true" name="sell_to_text" @@ -173,9 +137,8 @@ Choose whether to sell to anyone or a particular buyer. </text> <combo_box - follows="top|right" + follows="top|left" height="18" - layout="topleft" left_delta="0" name="sell_to" top_delta="32" @@ -196,9 +159,8 @@ </combo_box> <line_editor enabled="false" - follows="top|right" + follows="top|left" height="18" - layout="topleft" left_delta="0" name="sell_to_agent" top_pad="4" @@ -206,29 +168,22 @@ <button height="20" label="Select" - layout="topleft" left_pad="5" name="sell_to_select_agent" top_delta="0" width="60" /> <text - type="string" - length="1" follows="top|left" font="SansSerif" height="16" - layout="topleft" left="30" name="sell_objects_label"> 3. Sell the objects with the land? </text> <text - type="string" - length="1" font="SansSerifSmall" follows="top|left" height="25" - layout="topleft" word_wrap="true" left="40" name="sell_objects_text"> @@ -236,16 +191,14 @@ </text> <radio_group top_pad="5" - follows="top|right" + follows="top|left" height="40" - layout="topleft" left="40" name="sell_objects" - right="420"> + right="-20"> <radio_item bottom="40" height="0" - layout="topleft" left="10" name="none" visible="false" /> @@ -253,33 +206,27 @@ bottom="20" height="16" label="No, keep ownership of objects" - layout="topleft" left="10" name="no" /> <radio_item bottom="40" height="16" label="Yes, sell objects with land" - layout="topleft" left="10" name="yes" /> </radio_group> <button height="20" label="Show Objects" - layout="topleft" name="show_objects" left="70" top_pad="10" width="110" /> <text - type="string" - length="1" bottom_delta="30" follows="top|left" font="SansSerifBig" height="16" - layout="topleft" left="16" name="nag_message_label" right="-20"> @@ -289,16 +236,14 @@ follows="bottom|left" height="20" label="Set Land For Sale" - layout="topleft" left_delta="0" name="sell_btn" top_pad="10" width="130" /> <button - follows="bottom|right" + follows="bottom|left" height="20" label="Cancel" - layout="topleft" left_pad="30" name="cancel_btn" top_delta="0" diff --git a/indra/newview/skins/default/xui/en/floater_settings_debug.xml b/indra/newview/skins/default/xui/en/floater_settings_debug.xml index ffb11f3f18..3ed2bd7206 100644 --- a/indra/newview/skins/default/xui/en/floater_settings_debug.xml +++ b/indra/newview/skins/default/xui/en/floater_settings_debug.xml @@ -30,26 +30,29 @@ top_pad="10" width="320" word_wrap="true" /> - <combo_box - follows="top|left" - height="20" - layout="topleft" - left_delta="0" - name="boolean_combo" - top_pad="10" - visible="false" - width="100"> - <combo_box.item - label="TRUE" - name="TRUE" - value="true" /> - <combo_box.item - label="FALSE" - name="FALSE" - value="" /> - <combo_box.commit_callback - function="CommitSettings" /> - </combo_box> + <radio_group + follows="top|left" + height="30" + layout="topleft" + left_delta="0" + name="boolean_combo" + top_pad="10" + visible="false" + tab_stop="true" + width="100"> + <radio_item + top_pad="5" + label="TRUE" + name="TRUE" + value="true" /> + <radio_item + top_pad="5" + label="FALSE" + name="FALSE" + value="" /> + <commit_callback + function="CommitSettings" /> + </radio_group> <line_editor height="20" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml index 8860ac1e50..ec54522d3e 100644 --- a/indra/newview/skins/default/xui/en/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml @@ -2,8 +2,9 @@ <floater legacy_header_height="18" can_minimize="false" + can_close="true" follows="left|top" - height="526" + height="516" layout="topleft" name="Snapshot" help_topic="snapshot" @@ -14,94 +15,84 @@ name="unknown"> unknown </floater.string> - <text - type="string" - length="1" - follows="top|left" - height="15" - layout="topleft" - left="10" - name="type_label" - top="25" - width="195"> - Snapshot destination - </text> <radio_group - height="60" + height="58" label="Snapshot type" layout="topleft" - left_delta="0" + left="10" name="snapshot_type_radio" - top_pad="5" - width="195"> + top="25" + width="205"> <radio_item bottom="19" height="16" - label="Send via email" + label="Email" layout="topleft" name="postcard" /> <radio_item bottom="38" height="16" - label="Save to your inventory (L$[AMOUNT])" + label="My inventory (L$[AMOUNT])" layout="topleft" name="texture" /> <radio_item bottom="57" height="16" - label="Save to your hard drive" + label="Save to my computer" layout="topleft" name="local" /> </radio_group> <text type="string" + font="SansSerifSmall" length="1" follows="left|top" - height="25" + height="14" layout="topleft" + right="-5" left_delta="0" + halign="right" name="file_size_label" top_pad="106" width="195"> - File size: [SIZE] KB + [SIZE] KB </text> <button follows="left|top" - height="20" - label="Refresh Snapshot" + height="22" + image_overlay="Refresh_Off" layout="topleft" - left_delta="0" + left="10" name="new_snapshot_btn" - top_delta="15" - width="195" /> + width="23" /> <button follows="left|top" - height="20" + height="23" label="Send" layout="topleft" - left_delta="0" + left_pad="5" + right="-5" name="send_btn" - top_pad="2" - width="105" /> + width="100" /> <button follows="left|top" - height="20" + height="23" label="Save (L$[AMOUNT])" layout="topleft" - left_delta="0" + right="-5" name="upload_btn" top_delta="0" - width="105" /> + width="100" /> <flyout_button follows="left|top" - height="20" + height="23" label="Save" layout="topleft" - left_delta="0" + right="-5" name="save_btn" tool_tip="Save image to a file" top_delta="0" - width="105"> + width="100"> <flyout_button.item label="Save" value="save" /> @@ -109,52 +100,51 @@ label="Save As..." value="save as" /> </flyout_button> - <button + <button follows="left|top" - height="20" - label="Cancel" - layout="topleft" - left_pad="5" - name="discard_btn" - top_delta="0" - width="85" /> - <button - follows="left|top" - height="20" - label="More >>" + height="23" + label="More" layout="topleft" left="10" name="more_btn" tool_tip="Advanced options" - top="270" width="80" /> <button follows="left|top" - height="20" - label="<< Less" + height="23" + label="Less" layout="topleft" left_delta="0" name="less_btn" tool_tip="Advanced options" top_delta="0" width="80" /> + <button + follows="left|top" + height="23" + label="Cancel" + layout="topleft" + right="-5" + left_pad="5" + name="discard_btn" + width="100" /> <text type="string" length="1" follows="top|left" - height="15" + height="12" layout="topleft" - left_delta="0" + left="10" name="type_label2" top_pad="5" - width="115"> + width="120"> Size </text> <text type="string" length="1" follows="top|left" - height="15" + height="12" layout="topleft" left_pad="5" name="format_label" @@ -163,13 +153,12 @@ Format </text> <combo_box - height="20" + height="23" label="Resolution" layout="topleft" left="10" name="postcard_size_combo" - top="312" - width="115"> + width="120"> <combo_box.item label="Current Window" name="CurrentWindow" @@ -192,13 +181,13 @@ value="[i-1,i-1]" /> </combo_box> <combo_box - height="20" + height="23" label="Resolution" layout="topleft" left_delta="0" name="texture_size_combo" top_delta="0" - width="115"> + width="120"> <combo_box.item label="Current Window" name="CurrentWindow" @@ -221,13 +210,13 @@ value="[i-1,i-1]" /> </combo_box> <combo_box - height="20" + height="23" label="Resolution" layout="topleft" left_delta="0" name="local_size_combo" top_delta="0" - width="115"> + width="120"> <combo_box.item label="Current Window" name="CurrentWindow" @@ -262,12 +251,11 @@ value="[i-1,i-1]" /> </combo_box> <combo_box - height="20" + height="23" label="Format" layout="topleft" left_pad="5" name="local_format_combo" - top_delta="0" width="70"> <combo_box.item label="PNG" @@ -286,13 +274,13 @@ height="20" increment="32" label="Width" - label_width="30" + label_width="40" layout="topleft" left="10" max_val="6016" min_val="32" name="snapshot_width" - top="337" + top_pad="10" width="95" /> <spinner allow_text_entry="false" @@ -301,7 +289,7 @@ height="20" increment="32" label="Height" - label_width="35" + label_width="40" layout="topleft" left_pad="5" max_val="6016" @@ -311,7 +299,7 @@ width="95" /> <check_box bottom_delta="20" - label="Constrain Proportions" + label="Constrain proportions" layout="topleft" left="10" name="keep_aspect_check" /> @@ -321,32 +309,32 @@ height="15" increment="1" initial_value="75" - label="Image Quality" + label="Image quality" + label_width="100" layout="topleft" left_delta="0" max_val="100" name="image_quality_slider" top_pad="5" - width="210" /> + width="205" /> <text type="string" length="1" follows="left|top" - height="20" + height="13" layout="topleft" - left_delta="0" + left="10" name="layer_type_label" - top_pad="8" + top_pad="5" width="50"> Capture: </text> <combo_box - height="20" + height="23" label="Image Layers" layout="topleft" - left_delta="50" + left="30" name="layer_types" - top_delta="-3" width="145"> <combo_box.item label="Colors" @@ -362,33 +350,38 @@ value="objects" /> </combo_box> <check_box - bottom_delta="20" - label="Show interface in snapshot" + label="Interface" layout="topleft" - left="10" + left="30" + top_pad="10" + width="180" name="ui_check" /> <check_box - bottom_delta="20" - label="Show HUD objects in snapshot" + label="HUDs" layout="topleft" - left="10" + left="30" + top_pad="10" + width="180" name="hud_check" /> <check_box - bottom_delta="20" label="Keep open after saving" layout="topleft" left="10" + top_pad="8" + width="180" name="keep_open_check" /> <check_box - bottom_delta="20" - label="Freeze frame (fullscreen preview)" + label="Freeze frame (fullscreen)" layout="topleft" left="10" + top_pad="8" + width="180" name="freeze_frame_check" /> <check_box - bottom_delta="20" label="Auto-refresh" layout="topleft" left="10" + top_pad="8" + width="180" name="auto_snapshot_check" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_telehub.xml b/indra/newview/skins/default/xui/en/floater_telehub.xml index bb463edd4d..da412ed8a0 100644 --- a/indra/newview/skins/default/xui/en/floater_telehub.xml +++ b/indra/newview/skins/default/xui/en/floater_telehub.xml @@ -1,8 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<!-- Explicit left edge to avoid overlapping build tools --> <floater legacy_header_height="18" height="250" layout="topleft" + left="300" name="telehub" help_topic="telehub" title="TELEHUB" diff --git a/indra/newview/skins/default/xui/en/floater_test_widgets.xml b/indra/newview/skins/default/xui/en/floater_test_widgets.xml index a2055d8c52..84adabe4fa 100644 --- a/indra/newview/skins/default/xui/en/floater_test_widgets.xml +++ b/indra/newview/skins/default/xui/en/floater_test_widgets.xml @@ -355,7 +355,6 @@ line to actually fit <!-- "color_swatch" displays a color and spawns a color picker when clicked. --> <color_swatch - border_color="1 0 0 1" can_apply_immediately="true" color="0.3 0.6 0.9 1" follows="left|top" @@ -368,7 +367,6 @@ line to actually fit top="10" width="80" /> <color_swatch - border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" color="1 0 1 1" follows="left|top" diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index f2a5d902e7..e55453f772 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -2264,7 +2264,6 @@ even though the user gets a free copy. top="8" width="64" /> <color_swatch - border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" follows="left|top" height="80" diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml index a86126227e..474b703ae5 100644 --- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml @@ -1,10 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater can_resize="true" + can_minimize="true" + can_close="false" height="270" layout="topleft" min_height="146" - min_width="190" + min_width="190" name="floater_voice_controls" title="Voice Controls" save_visibility="true" @@ -66,7 +68,7 @@ name="user_text" text_color="white" top="4" - use_ellipses="true" + use_ellipses="true" value="Mya Avatar:" width="210" /> <output_monitor @@ -77,7 +79,7 @@ layout="topleft" name="speaking_indicator" right="-1" - top="2" + top="2" visible="true" width="20" /> </panel> diff --git a/indra/newview/skins/default/xui/en/floater_water.xml b/indra/newview/skins/default/xui/en/floater_water.xml index 439d68282f..32739ac953 100644 --- a/indra/newview/skins/default/xui/en/floater_water.xml +++ b/indra/newview/skins/default/xui/en/floater_water.xml @@ -4,6 +4,7 @@ height="240" layout="topleft" name="Water Floater" + help_topic="water_floater" save_rect="true" title="ADVANCED WATER EDITOR" width="700"> @@ -71,7 +72,6 @@ width="700"> <panel border="true" - border_color="EmphasisColor" follows="all" height="180" label="Settings" diff --git a/indra/newview/skins/default/xui/en/menu_attachment_self.xml b/indra/newview/skins/default/xui/en/menu_attachment_self.xml index c85dbbb1bc..281ec5a7c3 100644 --- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml +++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml @@ -54,25 +54,6 @@ <menu_item_call.on_enable function="Attachment.EnableDrop" /> </menu_item_call> - <!--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_separator layout="topleft" /> @@ -88,11 +69,9 @@ </menu_item_call> <menu_item_call label="My Appearance" - layout="topleft" name="Appearance..."> <menu_item_call.on_click - function="ShowFloater" - parameter="appearance" /> + function="CustomizeAvatar" /> <menu_item_call.on_enable function="Edit.EnableCustomizeAvatar" /> </menu_item_call> diff --git a/indra/newview/skins/default/xui/en/menu_avatar_self.xml b/indra/newview/skins/default/xui/en/menu_avatar_self.xml index c6ce612a76..9212d2d648 100644 --- a/indra/newview/skins/default/xui/en/menu_avatar_self.xml +++ b/indra/newview/skins/default/xui/en/menu_avatar_self.xml @@ -187,8 +187,7 @@ layout="topleft" name="Appearance..."> <menu_item_call.on_click - function="ShowFloater" - parameter="appearance" /> + function="CustomizeAvatar" /> <menu_item_call.on_enable function="Edit.EnableCustomizeAvatar" /> </menu_item_call> @@ -200,14 +199,6 @@ function="SideTray.PanelPeopleTab" parameter="friends_panel" /> </menu_item_call> - <!--menu_item_call - label="My Gestures" - layout="topleft" - name="Gestures..."> - <menu_item_call.on_click - function="ShowFloater" - parameter="gestures" /> - </menu_item_call--> <menu_item_call label="My Groups" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/menu_im_well_button.xml b/indra/newview/skins/default/xui/en/menu_im_well_button.xml new file mode 100644 index 0000000000..f8dfba91ff --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_im_well_button.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + layout="topleft" + name="IM Well Button Context Menu"> + <menu_item_call + label="Close All" + layout="topleft" + name="Close All"> + <menu_item_call.on_click + function="IMWellChicletMenu.Action" + parameter="close all" /> + <menu_item_call.on_enable + function="IMWellChicletMenu.EnableItem" + parameter="can close all" /> + </menu_item_call> +</context_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 ef0bf72058..01df208850 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 @@ -48,7 +48,17 @@ label="Block" name="block"> <menu_item_call.on_click - function="InspectAvatar.Block"/> + function="InspectAvatar.ToggleMute"/> + <menu_item_call.on_visible + function="InspectAvatar.EnableMute" /> + </menu_item_call> + <menu_item_call + label="Unblock" + name="unblock"> + <menu_item_call.on_click + function="InspectAvatar.ToggleMute"/> + <menu_item_call.on_visible + function="InspectAvatar.EnableUnmute" /> </menu_item_call> <menu_item_call label="Report" diff --git a/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml index 9894a01701..9dc2611663 100644 --- a/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml @@ -19,8 +19,7 @@ label="My Appearance" name="my_appearance"> <menu_item_call.on_click - function="ShowFloater" - parameter="appearance" /> + function="CustomizeAvatar" /> <menu_item_call.on_enable function="Edit.EnableCustomizeAvatar" /> </menu_item_call> diff --git a/indra/newview/skins/default/xui/en/menu_land.xml b/indra/newview/skins/default/xui/en/menu_land.xml index d88a2f8d25..cc6d8ad9c1 100644 --- a/indra/newview/skins/default/xui/en/menu_land.xml +++ b/indra/newview/skins/default/xui/en/menu_land.xml @@ -6,7 +6,7 @@ label="About Land" name="Place Information..."> <menu_item_call.on_click - function="ShowFloater" + function="Floater.Show" parameter="about_land" /> </menu_item_call> <!-- <menu_item_call @@ -28,8 +28,7 @@ label="Buy This Land" name="Land Buy"> <menu_item_call.on_click - function="ShowFloater" - parameter="buy land" /> + function="Land.Buy" /> <menu_item_call.on_enable function="World.EnableBuyLand" /> </menu_item_call> diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml index 53be40d7fd..7a0b11872a 100644 --- a/indra/newview/skins/default/xui/en/menu_login.xml +++ b/indra/newview/skins/default/xui/en/menu_login.xml @@ -16,7 +16,7 @@ name="Preferences..." shortcut="control|P"> <menu_item_call.on_click - function="ShowFloater" + function="Floater.Toggle" parameter="preferences" /> </menu_item_call> <menu_item_separator /> @@ -53,7 +53,7 @@ label="About [APP_NAME]" name="About Second Life"> <menu_item_call.on_click - function="ShowFloater" + function="Floater.Show" parameter="sl_about" /> </menu_item_call> </menu> @@ -175,16 +175,18 @@ name="UI Preview Tool" shortcut="control|T"> <menu_item_call.on_click - function="ShowFloater" + function="Floater.Toggle" parameter="ui_preview" /> </menu_item_call> <menu_item_separator /> + <!-- Broken <menu_item_call label="Show Side Tray" name="Show Side Tray"> <menu_item_call.on_click function="Advanced.ShowSideTray" /> </menu_item_call> + --> <menu label="UI Tests" name="UI Tests" @@ -194,7 +196,7 @@ name="Textbox" shortcut="control|1"> <menu_item_call.on_click - function="ShowFloater" + function="Floater.Show" parameter="test_textbox" /> </menu_item_call> <menu_item_call @@ -202,7 +204,7 @@ name="Text Editor" shortcut="control|2"> <menu_item_call.on_click - function="ShowFloater" + function="Floater.Show" parameter="test_text_editor" /> </menu_item_call> <menu_item_call @@ -210,14 +212,14 @@ name="Widgets" shortcut="control|shift|T"> <menu_item_call.on_click - function="ShowFloater" + function="Floater.Show" parameter="test_widgets" /> </menu_item_call> <menu_item_call label="Inspectors" name="Inspectors"> <menu_item_call.on_click - function="ShowFloater" + function="Floater.Show" parameter="test_inspectors" /> </menu_item_call> </menu> @@ -235,14 +237,14 @@ label="Show TOS" name="TOS"> <menu_item_call.on_click - function="ShowFloater" + function="Floater.Show" parameter="message_tos" /> </menu_item_call> <menu_item_call label="Show Critical Message" name="Critical"> <menu_item_call.on_click - function="ShowFloater" + function="Floater.Show" parameter="message_critical" /> </menu_item_call> <menu_item_call 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 8d0edf018d..f5ea3e735b 100644 --- a/indra/newview/skins/default/xui/en/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/en/menu_mini_map.xml @@ -51,7 +51,7 @@ label="World Map" name="World Map"> <menu_item_call.on_click - function="ShowFloater" + function="Floater.Show" parameter="world_map" /> </menu_item_call> </menu> diff --git a/indra/newview/skins/default/xui/en/menu_notification_well_button.xml b/indra/newview/skins/default/xui/en/menu_notification_well_button.xml new file mode 100644 index 0000000000..263ac40f4e --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_notification_well_button.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + layout="topleft" + name="Notification Well Button Context Menu"> + <menu_item_call + label="Close All" + layout="topleft" + name="Close All"> + <menu_item_call.on_click + function="NotificationWellChicletMenu.Action" + parameter="close all" /> + <menu_item_call.on_enable + function="NotificationWellChicletMenu.EnableItem" + parameter="can close all" /> + </menu_item_call> +</context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_participant_list.xml b/indra/newview/skins/default/xui/en/menu_participant_list.xml index 449202aaaa..31263fbea8 100644 --- a/indra/newview/skins/default/xui/en/menu_participant_list.xml +++ b/indra/newview/skins/default/xui/en/menu_participant_list.xml @@ -2,7 +2,29 @@ <context_menu layout="topleft" name="Participant List Context Menu"> - <menu_item_call + <menu_item_check + label="Sort by Name" + layout="topleft" + name="SortByName"> + <menu_item_check.on_click + function="ParticipantList.Sort" + parameter="sort_by_name" /> + <menu_item_check.on_check + function="ParticipantList.CheckItem" + parameter="is_sorted_by_name" /> + </menu_item_check> + <menu_item_check + label="Sort by Recent Speakers" + layout="topleft" + name="SortByRecentSpeakers"> + <menu_item_check.on_click + function="ParticipantList.Sort" + parameter="sort_by_recent_speakers" /> + <menu_item_check.on_check + function="ParticipantList.CheckItem" + parameter="is_sorted_by_recent_speakers" /> + </menu_item_check> + <menu_item_call label="View Profile" layout="topleft" name="View Profile"> @@ -51,6 +73,8 @@ <menu_item_call.on_click function="Avatar.Pay" /> </menu_item_call> + <menu_item_separator + layout="topleft" /> <menu_item_check label="Block Voice" layout="topleft" @@ -64,8 +88,6 @@ function="ParticipantList.EnableItem" parameter="can_block" /> </menu_item_check> - <menu_item_separator - layout="topleft" /> <menu_item_check label="Block Text" layout="topleft" @@ -79,6 +101,8 @@ function="ParticipantList.EnableItem" parameter="can_mute_text" /> </menu_item_check> + <menu_item_separator + layout="topleft" /> <context_menu label="Moderator Options >" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/menu_people_groups.xml b/indra/newview/skins/default/xui/en/menu_people_groups.xml new file mode 100644 index 0000000000..afa680139d --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_people_groups.xml @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu name="menu_group_plus" + left="0" bottom="0" visible="false" + mouse_opaque="false" opaque="true" color="MenuDefaultBgColor" drop_shadow="false"> + <menu_item_call + label="View Info" + name="View Info"> + <menu_item_call.on_click + function="People.Groups.Action" + parameter="view_info" /> + <menu_item_call.on_enable + function="People.Groups.Enable" + parameter="view_info" /> + </menu_item_call> + <menu_item_call + label="Chat" + name="Chat"> + <menu_item_call.on_click + function="People.Groups.Action" + parameter="chat" /> + <menu_item_call.on_enable + function="People.Groups.Enable" + parameter="chat" /> + </menu_item_call> + <menu_item_call + label="Call" + name="Call"> + <menu_item_call.on_click + function="People.Groups.Action" + parameter="call" /> + <menu_item_call.on_enable + function="People.Groups.Enable" + parameter="call" /> + </menu_item_call> + <menu_item_separator /> + <menu_item_call + label="Activate" + name="Activate"> + <menu_item_call.on_click + function="People.Groups.Action" + parameter="activate" /> + <menu_item_call.on_enable + function="People.Groups.Enable" + parameter="activate" /> + </menu_item_call> + <menu_item_separator /> + <menu_item_call + label="Leave" + name="Leave"> + <menu_item_call.on_click + function="People.Groups.Action" + parameter="leave" /> + <menu_item_call.on_enable + function="People.Groups.Enable" + parameter="leave" /> + </menu_item_call> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 0891afaf76..8f1799688b 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -32,8 +32,7 @@ layout="topleft" name="Buy and Sell L$"> <menu_item_call.on_click - function="ShowFloater" - parameter="buy currency" /> + function="BuyCurrency" /> </menu_item_call> <menu_item_separator layout="topleft" /> @@ -50,8 +49,7 @@ layout="topleft" name="Appearance"> <menu_item_call.on_click - function="ShowFloater" - parameter="appearance" /> + function="CustomizeAvatar" /> <menu_item_call.on_enable function="Edit.EnableCustomizeAvatar" /> </menu_item_call> @@ -82,7 +80,7 @@ name="Gestures" shortcut="control|G"> <menu_item_call.on_click - function="ShowFloater" + function="Floater.Toggle" parameter="gestures" /> </menu_item_call> <menu @@ -240,30 +238,55 @@ layout="topleft" name="World" tear_off="true"> - <menu_item_check - label="Move" + <menu_item_check + label="Mini-Map" layout="topleft" - name="Movement Controls"> + name="Mini-Map" + shortcut="control|shift|M"> <menu_item_check.on_check function="Floater.Visible" - parameter="moveview" /> + parameter="mini_map" /> <menu_item_check.on_click function="Floater.Toggle" - parameter="moveview" /> + parameter="mini_map" /> </menu_item_check> - <menu_item_check - label="View" + <menu_item_check + label="World Map" layout="topleft" - name="Camera Controls"> + name="World Map" + shortcut="control|M" + use_mac_ctrl="true"> <menu_item_check.on_check function="Floater.Visible" - parameter="camera" /> + parameter="world_map" /> <menu_item_check.on_click function="Floater.Toggle" - parameter="camera" /> + parameter="world_map" /> </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_item_call + label="Landmark This Place" + 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 + create_jump_keys="true" + label="About This Place" + layout="topleft" + name="Land" + tear_off="true"> <menu_item_call label="About Land" layout="topleft" @@ -280,13 +303,15 @@ function="Floater.Show" parameter="region_info" /> </menu_item_call> + </menu> + <menu_item_separator + layout="topleft" /> <menu_item_call label="Buy Land" layout="topleft" name="Buy Land"> <menu_item_call.on_click - function="ShowFloater" - parameter="buy land" /> + function="Land.Buy" /> <menu_item_call.on_enable function="World.EnableBuyLand" /> </menu_item_call> @@ -295,7 +320,7 @@ layout="topleft" name="My Land"> <menu_item_call.on_click - function="ShowFloater" + function="Floater.Show" parameter="land_holdings" /> </menu_item_call> <menu @@ -304,6 +329,28 @@ layout="topleft" name="Land" tear_off="true"> + <menu_item_check + label="Move Controls" + 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 Controls" + 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_check label="Ban Lines" layout="topleft" @@ -350,32 +397,8 @@ </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" + label="Teleport Home" layout="topleft" name="Teleport Home" shortcut="control|shift|H"> @@ -384,31 +407,15 @@ <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_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_check label="Show Navigation Bar" layout="topleft" @@ -435,17 +442,6 @@ layout="topleft" />--> <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_item_separator - layout="topleft" /> <menu create_jump_keys="true" label="Sun" @@ -487,7 +483,7 @@ parameter="midnight" /> </menu_item_call> <menu_item_call - label="Use the Estate Time" + label="Estate Time" layout="topleft" name="Revert to Region Default"> <menu_item_call.on_click @@ -868,14 +864,6 @@ 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 @@ -1067,14 +1055,14 @@ function="ShowHelp" parameter="f1_help" /> </menu_item_call> - <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_call>--> <menu_item_separator layout="topleft" /> <menu_item_call @@ -1082,8 +1070,7 @@ layout="topleft" name="Report Abuse"> <menu_item_call.on_click - function="ShowFloater" - parameter="complaint reporter" /> + function="ReportAbuse" /> </menu_item_call> <menu_item_call label="Report Bug" @@ -1110,17 +1097,6 @@ 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" @@ -2537,7 +2513,7 @@ function="CheckControl" parameter="TextureDisable" /> <menu_item_check.on_click - function="ToggleControl" + function="ToggleControl" parameter="TextureDisable" /> </menu_item_check> <menu_item_check @@ -2999,14 +2975,6 @@ <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" @@ -3640,17 +3608,6 @@ 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" diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index bcf006f1a0..d4b712e048 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -370,6 +370,19 @@ Add this Ability to '[ROLE_NAME]'? </notification> <notification + icon="alertmodal.tga" + name="AttachmentDrop" + type="alertmodal"> + You are about to drop your attachment. + Are you sure you want to continue? + <usetemplate + ignoretext="Confirm before dropping attachments" + name="okcancelignore" + notext="No" + yestext="Yes"/> + </notification> + + <notification icon="alertmodal.tga" name="ClickUnimplemented" type="alertmodal"> @@ -4328,7 +4341,6 @@ Hmm. Gesture [NAME] is missing from the database. name="UnableToLoadGesture" type="notifytip"> Unable to load gesture [NAME]. -Please try again. </notification> <notification @@ -5761,6 +5773,17 @@ They will be blocked for a few seconds for your security. </form> </notification> + <notification + icon="alert.tga" + name="ConfirmCloseAll" + type="alertmodal"> +Are you sure you want to close all IMs? + <usetemplate + name="okcancelignore" + notext="Cancel" + yestext="Ok"/> + </notification> + <notification icon="notifytip.tga" name="AttachmentSaved" type="notifytip"> Attachment has been saved. 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 3ed91cb48f..3416b2369d 100644 --- a/indra/newview/skins/default/xui/en/panel_activeim_row.xml +++ b/indra/newview/skins/default/xui/en/panel_activeim_row.xml @@ -69,9 +69,9 @@ name="contact_name" layout="topleft" top="10" - left_pad="20" + left_pad="10" height="14" - width="245" + width="255" length="1" follows="right|left" use_ellipses="true" diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index 3e2910458f..5ae808581d 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -327,6 +327,7 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly. min_width="35" user_resize="false"> <chiclet_im_well + max_displayed_count="99" flash_period="0.3" follows="right" height="23" @@ -356,7 +357,6 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well image_selected="PushButton_Selected_Press" label_color="Black" left="0" - max_displayed_count="99" name="Unread IM messages" pad_left="0" pad_right="0" 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 3e6ea84bf2..859822dd81 100644 --- a/indra/newview/skins/default/xui/en/panel_chat_header.xml +++ b/indra/newview/skins/default/xui/en/panel_chat_header.xml @@ -9,7 +9,7 @@ layout="topleft" name="im_header" width="310"> - <avatar_icon + <avatar_icon follows="left" height="18" image_name="Generic_Person" @@ -20,7 +20,7 @@ top="3" width="18" /> <text_editor - allow_scroll="false" + allow_scroll="false" v_pad = "0" read_only = "true" follows="left|right" diff --git a/indra/newview/skins/default/xui/en/panel_edit_gloves.xml b/indra/newview/skins/default/xui/en/panel_edit_gloves.xml index f9ef038314..7aca40e8d9 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_gloves.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_gloves.xml @@ -29,7 +29,6 @@ top="10" width="64" /> <color_swatch - border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" follows="left|top" height="80" diff --git a/indra/newview/skins/default/xui/en/panel_edit_jacket.xml b/indra/newview/skins/default/xui/en/panel_edit_jacket.xml index f4c03399fe..ed92b1e0f8 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_jacket.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_jacket.xml @@ -41,7 +41,6 @@ top="10" width="64" /> <color_swatch - border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" follows="left|top" height="80" diff --git a/indra/newview/skins/default/xui/en/panel_edit_pants.xml b/indra/newview/skins/default/xui/en/panel_edit_pants.xml index ab105afd88..b764188e04 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_pants.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_pants.xml @@ -29,7 +29,6 @@ top="10" width="64" /> <color_swatch - border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" follows="left|top" height="80" diff --git a/indra/newview/skins/default/xui/en/panel_edit_shirt.xml b/indra/newview/skins/default/xui/en/panel_edit_shirt.xml index 9a13dfa3c4..4b7235545f 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_shirt.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_shirt.xml @@ -29,7 +29,6 @@ top="10" width="64" /> <color_swatch - border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" follows="left|top" height="80" diff --git a/indra/newview/skins/default/xui/en/panel_edit_shoes.xml b/indra/newview/skins/default/xui/en/panel_edit_shoes.xml index 154b9d959c..e886afa010 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_shoes.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_shoes.xml @@ -29,7 +29,6 @@ top="10" width="64" /> <color_swatch - border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" follows="left|top" height="80" diff --git a/indra/newview/skins/default/xui/en/panel_edit_skirt.xml b/indra/newview/skins/default/xui/en/panel_edit_skirt.xml index d0f4d75444..6cccab1843 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_skirt.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_skirt.xml @@ -29,7 +29,6 @@ top="10" width="64" /> <color_swatch - border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" follows="left|top" height="80" diff --git a/indra/newview/skins/default/xui/en/panel_edit_socks.xml b/indra/newview/skins/default/xui/en/panel_edit_socks.xml index acc6d482a7..fc7de00714 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_socks.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_socks.xml @@ -29,7 +29,6 @@ top="10" width="64" /> <color_swatch - border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" follows="left|top" height="80" diff --git a/indra/newview/skins/default/xui/en/panel_edit_underpants.xml b/indra/newview/skins/default/xui/en/panel_edit_underpants.xml index 4f5c1c08b7..03e0bb70ef 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_underpants.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_underpants.xml @@ -29,7 +29,6 @@ top="10" width="64" /> <color_swatch - border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" follows="left|top" height="80" diff --git a/indra/newview/skins/default/xui/en/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/en/panel_edit_undershirt.xml index 715674e88b..20c56142fb 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_undershirt.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_undershirt.xml @@ -29,7 +29,6 @@ top="10" width="64" /> <color_swatch - border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" follows="left|top" height="80" 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 1b70b95a93..e096715cee 100644 --- a/indra/newview/skins/default/xui/en/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml @@ -78,7 +78,6 @@ Maximum 200 per group daily image_unselected="AddItem_Off" image_disabled="AddItem_Disabled" layout="topleft" - label="Create a new notice" left="5" name="create_new_notice" tool_tip="Create a new notice" 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 0a3fd1699f..30e652befd 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 @@ -21,32 +21,32 @@ value="Unknown" width="100" /> <button - follows="left|top" + follows="left|top|right" height="20" label="Profile" name="view_profile_btn" width="100" /> <button - follows="left|top" + follows="left|top|right" height="20" label="Add Friend" name="add_friend_btn" width="100" /> <button - follows="left|top" + follows="left|top|right" height="20" label="Teleport" name="teleport_btn" width="100" /> <button - follows="left|top" + follows="left|top|right" height="20" label="Share" name="share_btn" width="100" /> <!--Removing pay button to save space - will update spec - verified by Erica/Steve --> <!-- <button - follows="left|top" + follows="left|top|right" height="20" label="Pay" name="pay_btn" @@ -56,13 +56,14 @@ bg_alpha_color="DkGray2" border="false" top_pad="10" - follows="left|bottom" + follows="left|bottom|right" height="70" left="1" name="panel_call_buttons" width="109"> <button bottom="10" + follows="left|top|right" height="20" label="Call" left_delta="5" @@ -70,6 +71,7 @@ width="100" /> <button bottom="35" + follows="left|top|right" height="20" label="Leave Call" name="end_call_btn" @@ -77,6 +79,7 @@ width="100" /> <button bottom="10" + follows="left|top|right" height="20" label="Voice Controls" name="voice_ctrls_btn" 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 68e58b27ec..9f06e64560 100644 --- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml @@ -60,6 +60,7 @@ layout="topleft" left="10" name="back_btn" + tool_tip="Back" tab_stop="false" top="0" width="23" /> diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_security.xml b/indra/newview/skins/default/xui/en/panel_media_settings_security.xml index 1f41a0d284..1f580831f9 100644 --- a/indra/newview/skins/default/xui/en/panel_media_settings_security.xml +++ b/indra/newview/skins/default/xui/en/panel_media_settings_security.xml @@ -17,7 +17,7 @@ font="SansSerifSmall" height="16" initial_value="false" - label="Only Allow Access to Specified URLs (by prefix)" + label="Only Allow Access to Specified URL patterns" left="10" mouse_opaque="true" name="whitelist_enable" @@ -81,10 +81,9 @@ height="40" left="30" text_color="0.6 0.0 0.0 1.0" + word_wrap="true" name="home_url_fails_whitelist"> -Warning: the home page specified in the General tab -fails to pass this whitelist. It has been disabled -until a valid entry has been added. +Warning: the home page specified in the General tab fails to pass this whitelist. It has been disabled until a valid entry has been added. </text> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_notes.xml b/indra/newview/skins/default/xui/en/panel_notes.xml index 9e7c9477d4..f15e75dee9 100644 --- a/indra/newview/skins/default/xui/en/panel_notes.xml +++ b/indra/newview/skins/default/xui/en/panel_notes.xml @@ -114,7 +114,7 @@ width="313"> <button follows="bottom|left" - height="19" + height="23" label="Add" layout="topleft" left="0" @@ -125,7 +125,7 @@ width="55" /> <button follows="bottom|left" - height="19" + height="23" label="IM" layout="topleft" name="im" @@ -135,7 +135,7 @@ width="40" /> <button follows="bottom|left" - height="19" + height="23" label="Call" layout="topleft" name="call" @@ -146,7 +146,7 @@ <button enabled="false" follows="bottom|left" - height="19" + height="23" label="Map" layout="topleft" name="show_on_map_btn" @@ -156,7 +156,7 @@ width="50" /> <button follows="bottom|left" - height="19" + height="23" label="Teleport" layout="topleft" name="teleport" diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index 87861e7901..08a10553a8 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -346,7 +346,7 @@ background_visible="true" follows="bottom|left" top="4" left="0" - height="19" + height="23" label="Profile" layout="topleft" name="view_profile_btn" @@ -356,7 +356,7 @@ background_visible="true" follows="bottom|left" top="4" left_pad="2" - height="19" + height="23" label="IM" layout="topleft" name="im_btn" @@ -366,7 +366,7 @@ background_visible="true" follows="bottom|left" top="4" left_pad="2" - height="19" + height="23" label="Call" layout="topleft" name="call_btn" @@ -376,7 +376,7 @@ background_visible="true" follows="left|top" top="4" left_pad="2" - height="19" + height="23" label="Share" layout="topleft" name="share_btn" @@ -385,7 +385,7 @@ background_visible="true" follows="bottom|left" top="4" left_pad="2" - height="19" + height="23" label="Teleport" layout="topleft" name="teleport_btn" @@ -395,7 +395,7 @@ background_visible="true" follows="bottom|left" top="4" left="0" - height="19" + height="23" label="Group Profile" layout="topleft" name="group_info_btn" @@ -405,11 +405,21 @@ background_visible="true" follows="bottom|left" top="4" left_pad="2" - height="19" + height="23" label="Group Chat" layout="topleft" name="chat_btn" tool_tip="Open chat session" width="110" /> + <button + follows="bottom|left" + top="4" + left_pad="2" + height="23" + label="Group Call" + layout="topleft" + name="group_call_btn" + tool_tip="Call this group" + width="110" /> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml index 0cf2a7afc3..f68202d287 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,7 @@ name="buttons"> <button follows="bottom|left" - height="19" + height="23" label="Teleport" layout="topleft" left="0" @@ -112,7 +112,7 @@ width="90" /> <button follows="bottom|left" - height="19" + height="23" label="Map" layout="topleft" left_pad="10" @@ -121,7 +121,7 @@ width="90" /> <button follows="bottom|left" - height="19" + height="23" label="Edit" layout="topleft" right="-1" diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml index 2230229b14..1fc553ff36 100644 --- a/indra/newview/skins/default/xui/en/panel_picks.xml +++ b/indra/newview/skins/default/xui/en/panel_picks.xml @@ -129,7 +129,7 @@ <button enabled="false" follows="bottom|left" - height="25" + height="23" label="Info" layout="topleft" left="5" @@ -141,7 +141,7 @@ <button enabled="false" follows="bottom|left" - height="25" + height="23" label="Teleport" layout="topleft" left_pad="5" @@ -153,7 +153,7 @@ <button enabled="false" follows="bottom|left" - height="25" + height="23" label="Map" layout="topleft" left_pad="5" 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 b25d9a7dfc..8fc2ae39f0 100644 --- a/indra/newview/skins/default/xui/en/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml @@ -145,6 +145,7 @@ layout="topleft" left="10" name="back_btn" + tool_tip="Back" tab_stop="false" top="0" width="23" /> @@ -517,7 +518,7 @@ width="60" /> <button follows="bottom|right" - height="19" + height="23" label="About Land" layout="topleft" name="about_land_btn" @@ -526,7 +527,7 @@ top="138" width="90"> <click_callback - function="ShowFloater" + function="Floater.Show" parameter="about_land" /> </button> </panel> @@ -644,7 +645,7 @@ </text> <button follows="bottom|right" - height="19" + height="23" label="Region/Estate" layout="topleft" name="region_info_btn" @@ -652,7 +653,7 @@ tab_stop="false" width="105"> <click_callback - function="ShowFloater" + function="Floater.Show" parameter="region_info" /> </button> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml index d4a6c7f3b3..8a5c023133 100644 --- a/indra/newview/skins/default/xui/en/panel_places.xml +++ b/indra/newview/skins/default/xui/en/panel_places.xml @@ -72,7 +72,7 @@ background_visible="true" width="313"> <button follows="bottom|left" - height="19" + height="23" label="Teleport" layout="topleft" left="5" @@ -82,37 +82,38 @@ background_visible="true" width="100" /> <button follows="bottom|left" - height="19" + height="23" label="Map" layout="topleft" left_pad="5" name="map_btn" - tool_tip="Show selected area on the map" top="0" width="70" /> <button follows="bottom|left" - height="19" + height="23" label="Edit" layout="topleft" left_pad="5" name="edit_btn" + tool_tip="Edit landmark information" top="0" width="70" /> <button follows="bottom|right" - height="19" + height="23" image_disabled="ForwardArrow_Off" image_selected="ForwardArrow_Press" image_unselected="ForwardArrow_Off" layout="topleft" name="overflow_btn" + tool_tip="Show additional options" right="-10" top="0" width="18" /> <button follows="bottom|right" - height="19" + height="23" label="Close" layout="topleft" name="close_btn" @@ -121,7 +122,7 @@ background_visible="true" width="60" /> <button follows="bottom|right" - height="19" + height="23" label="Cancel" layout="topleft" name="cancel_btn" @@ -130,7 +131,7 @@ background_visible="true" width="60" /> <button follows="bottom|right" - height="19" + height="23" label="Save" layout="topleft" name="save_btn" 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 405ff02836..426a2b1f9e 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml @@ -29,7 +29,6 @@ name="bubble_text_chat" width="150" /> <color_swatch - border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" color="0 0 0 1" control_name="BackgroundChatColor" 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 fff53c1de2..017c321767 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml @@ -16,13 +16,14 @@ control_name="ChatFontSize" name="chat_font_size" top="10" - width="331"> + width="440"> <radio_item height="16" label="Small" layout="topleft" left="0" name="radio" + value="0" top="10" width="125" /> <radio_item @@ -31,6 +32,7 @@ layout="topleft" left_delta="145" name="radio2" + value="1" top_delta="0" width="125" /> <radio_item @@ -39,11 +41,11 @@ layout="topleft" left_delta="170" name="radio3" + value="2" top_delta="0" width="125" /> </radio_group> <color_swatch - border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" follows="left|top" height="47" @@ -73,7 +75,6 @@ Me </text> <color_swatch - border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" follows="left|top" height="47" @@ -103,7 +104,6 @@ Others </text> <color_swatch - border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" color="0.6 0.6 1 1" follows="left|top" @@ -135,7 +135,6 @@ IM </text> <color_swatch - border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" color="0.8 1 1 1" follows="left|top" @@ -167,7 +166,6 @@ System </text> <color_swatch - border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" color="0.82 0.82 0.99 1" follows="left|top" @@ -198,7 +196,6 @@ Errors </text> <color_swatch - border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" color="0.7 0.9 0.7 1" follows="left|top" @@ -229,7 +226,6 @@ Objects </text> <color_swatch - border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" color="0.7 0.9 0.7 1" follows="left|top" @@ -260,7 +256,6 @@ Owner </text> <color_swatch - border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" color="0.6 0.6 1 1" follows="left|top" @@ -340,6 +335,7 @@ layout="topleft" left="0" name="radio" + value="0" top="0" width="150" /> <radio_item @@ -348,6 +344,7 @@ layout="topleft" left_delta="145" name="radio2" + value="1" top_delta="0" width="150" /> </radio_group> 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 b5c6b637e5..41bd7f3dcc 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml @@ -13,7 +13,7 @@ type="string" length="1" follows="left|top" - height="10" + height="15" layout="topleft" left="30" name="language_textbox" @@ -23,14 +23,13 @@ </text> <combo_box control_name="Language" - follows="left|bottom" + follows="left|top" height="23" layout="topleft" - left_delta="50" + left="50" max_chars="135" name="language_combobox" - top_pad="10" - width="170"> + width="200"> <combo_box.item enabled="true" label="System default" @@ -66,7 +65,6 @@ label="Italiano (Italian) - Beta" name="Italian" value="it" /> - <combo_box.item enabled="true" label="Nederlands (Dutch) - Beta" @@ -82,62 +80,54 @@ label="Portugués (Portuguese) - Beta" name="Portugese" value="pt" /> - - - - <combo_box.item enabled="true" label="日本語 (Japanese) - Beta" name="(Japanese)" value="ja" /> - - </combo_box> <text + font="SansSerifSmall" type="string" length="1" follows="left|top" - height="10" + height="18" layout="topleft" - left_delta="175" + left_pad="5" name="language_textbox2" - top_delta="1" - width="400"> + width="200"> (Requires restart) </text> <text type="string" length="1" follows="left|top" - height="10" + height="15" layout="topleft" left="30" + top_pad="15" name="maturity_desired_prompt" - top_pad="10" - width="400"> + width="200"> I want to access content rated: </text> <text type="string" length="1" follows="left|top" - height="10" + height="15" layout="topleft" - left="90" + left_pad="5" name="maturity_desired_textbox" - top_pad="10" - width="400"> + width="200"> </text> <combo_box control_name="PreferredMaturity" - follows="left|bottom" + follows="left|top" height="23" layout="topleft" - left_delta="-10" + left="50" name="maturity_desired_combobox" - top_pad="-10" - width="170"> + width="200"> <combo_box.item label="General, Moderate, Adult" name="Desired_Adult" @@ -155,23 +145,22 @@ type="string" length="1" follows="left|top" - height="10" + height="15" layout="topleft" left="30" name="start_location_textbox" - top_delta="20" + top_pad="10" width="394"> Start location: </text> <combo_box control_name="LoginLocation" - follows="left|bottom" + follows="left|top" height="23" layout="topleft" - left_delta="50" name="start_location_combo" - top_pad="10" - width="170"> + left="50" + width="200"> <combo_box.item label="My Last Location" name="MyLastLocation" @@ -187,54 +176,48 @@ initial_value="true" label="Show on login" layout="topleft" - left_delta="175" + left_pad="5" name="show_location_checkbox" - top_delta="1" + top_delta="5" width="256" /> - <text type="string" length="1" follows="left|top" - height="10" + height="15" layout="topleft" left="30" name="name_tags_textbox" - top_pad="10" + top_pad="15" width="400"> Name tags: </text> <radio_group control_name="AvatarNameTagMode" - height="30" + height="20" layout="topleft" - left_delta="50" - name="Name_Tag_Preference" - top_pad="10"> + left="50" + name="Name_Tag_Preference"> <radio_item - height="16" label="Off" layout="topleft" - left="0" name="radio" - top_pad="0" - width="98" /> + value="0" + width="100" /> <radio_item - height="16" label="On" layout="topleft" left_pad="12" name="radio2" - top_delta="0" - width="98" /> + value="1" + width="100" /> <radio_item - height="16" label="Show briefly" layout="topleft" left_pad="12" name="radio3" - top_delta="0" - width="98" /> + value="2" + width="100" /> </radio_group> <check_box enabled_control="AvatarNameTagMode" @@ -242,9 +225,8 @@ height="16" label="Show my name" layout="topleft" - left_delta="0" + left="50" name="show_my_name_checkbox1" - top_pad="-7" width="300" /> <check_box enabled_control="AvatarNameTagMode" @@ -255,7 +237,6 @@ layout="topleft" left_delta="175" name="small_avatar_names_checkbox" - top_delta="0" width="200" /> <check_box enabled_control="AvatarNameTagMode" @@ -271,92 +252,95 @@ type="string" length="1" follows="left|top" - height="10" + height="15" layout="topleft" left="30" name="effects_color_textbox" - top_pad="5" - width="400"> + top_pad="15" + width="200"> My effects: </text> + <text + type="string" + length="1" + follows="left|top" + height="13" + layout="topleft" + left_pad="5" + name="title_afk_text" + width="190"> + Away timeout: + </text> <color_swatch - border_color="0.45098 0.517647 0.607843 1" control_name="EffectColor" follows="left|top" - height="48" + height="50" layout="topleft" - left_delta="50" + left="50" name="effect_color_swatch" tool_tip="Click to open Color Picker" - top_pad="5" - width="32" /> + width="38" /> + <combo_box + height="23" + layout="topleft" + control_name="AFKTimeout" + left_pad="160" + label="Away timeout:" + top_delta="0" + name="afk" + width="130"> + <combo_box.item + label="2 minutes" + name="item0" + value="120" /> + <combo_box.item + label="5 minutes" + name="item1" + value="300" /> + <combo_box.item + label="10 minutes" + name="item2" + value="600" /> + <combo_box.item + label="30 minutes" + name="item3" + value="1800" /> + <combo_box.item + label="never" + name="item4" + value="0" /> + </combo_box> <text type="string" length="1" follows="left|top" - height="15" - layout="topleft" - left="30" - name="title_afk_text" - text_color="white" - top_pad="-5" - width="190"> - Away timeout: - </text> - <spinner - control_name="AFKTimeout" - decimal_digits="0" - follows="left|top" - halign="right" - height="15" - increment="1" - initial_value="300" - label="" - label_width="0" - layout="topleft" - left_delta="50" - max_val="600" - min_val="30" - name="afk_timeout_spinner" - top_pad="5" - width="50" /> - <text - type="string" - length="1" - follows="left|top" - halign="left" - height="15" - layout="topleft" - left_pad="2" - name="seconds_textbox" - width="70"> - seconds - </text> - <text - type="string" - length="1" - follows="left|top" - height="10" + height="13" layout="topleft" text_color="white" left="30" mouse_opaque="false" name="text_box3" - top_pad="10" + top_pad="15" width="240"> Busy mode response: </text> <text_editor control_name="BusyModeResponse2" + text_readonly_color="LabelDisabledColor" + bg_writeable_color="LtGray" + use_ellipses="false" + bg_visible="false" + border_visible="false" + hover="false" + text_color="LabelTextColor" commit_on_focus_lost = "true" follows="left|top" - height="56" + height="50" layout="topleft" - left_delta="50" + left="50" name="busy_response" width="400" - word_wrap="true" - top_pad="5"> + word_wrap="true"> log_in_to_change </text_editor> 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 04985d0fa9..f97ccafecc 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -28,7 +28,7 @@ follows="left|top" height="15" increment="0.025" - initial_valu="1" + initial_value="1" layout="topleft" left_delta="52" max_val="1.4" @@ -656,6 +656,7 @@ layout="topleft" left="3" name="SunMoon" + value="0" top="3" width="156" /> <radio_item @@ -664,6 +665,7 @@ layout="topleft" left_delta="0" name="LocalLights" + value="1" top_delta="16" width="156" /> </radio_group> 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 a65f7d3a54..34bd6fb091 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml @@ -98,12 +98,12 @@ decimal_digits="0" follows="left|top" height="15" - increment="10" - initial_value="50" + increment="100" + initial_value="500" layout="topleft" left_delta="150" - max_val="1500" - min_val="50" + max_val="10000" + min_val="100" name="max_bandwidth" top_delta="0" width="180" /> @@ -268,24 +268,26 @@ name="use_external_browser" top_pad="4" width="480"> - <radio_item - height="20" - label="Use built-in browser" - layout="topleft" - left="0" - name="internal" - tool_tip="Use the built-in web browser for help, web links, etc. This browser opens as a new window inside [APP_NAME]." - top="0" - width="480" /> - <radio_item - height="20" - label="Use my browser (IE, Firefox)" - layout="topleft" - left_delta="0" - name="external" - tool_tip="Use the default system web browser for help, web links, etc. Not recommended if running full screen." - top_delta="20" - width="480" /> + <radio_item + height="20" + label="Use built-in browser" + layout="topleft" + left="0" + name="internal" + value="0" + tool_tip="Use the built-in web browser for help, web links, etc. This browser opens as a new window inside [APP_NAME]." + top="0" + width="480" /> + <radio_item + height="20" + label="Use my browser (IE, Firefox)" + layout="topleft" + left_delta="0" + name="external" + value="1" + tool_tip="Use the default system web browser for help, web links, etc. Not recommended if running full screen." + top_delta="20" + width="480" /> </radio_group> <check_box diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml index 638bc3cabd..342cf4144f 100644 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_profile.xml @@ -275,12 +275,12 @@ left="0" name="profile_buttons_panel" top_pad="2" - bottom="10" + bottom="0" height="19" width="303"> <button follows="bottom|left" - height="19" + height="23" label="Add Friend" layout="topleft" left="0" @@ -291,7 +291,7 @@ width="77" /> <button follows="bottom|left" - height="19" + height="23" label="IM" layout="topleft" name="im" @@ -301,7 +301,7 @@ width="33" /> <button follows="bottom|left" - height="19" + height="23" label="Call" layout="topleft" name="call" @@ -312,7 +312,7 @@ <button enabled="false" follows="bottom|left" - height="19" + height="23" label="Map" layout="topleft" name="show_on_map_btn" @@ -322,7 +322,7 @@ width="44" /> <button follows="bottom|left" - height="19" + height="23" label="Teleport" layout="topleft" name="teleport" @@ -332,7 +332,7 @@ width="67" /> <button follows="bottom|right" - height="19" + height="23" label="▼" layout="topleft" name="overflow_btn" @@ -352,14 +352,14 @@ width="303"> <button follows="bottom|right" - height="19" + height="23" left="10" label="Edit Profile" name="edit_profile_btn" width="130" /> <button follows="bottom|right" - height="19" + height="23" label="Edit Appearance" left_pad="10" name="edit_appearance_btn" 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 8e683bffc1..6324ec2bd8 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_view.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml @@ -26,18 +26,20 @@ top="2" width="23" /> <text_editor - read_only = "true" - follows="top|left|right" - font="SansSerifHugeBold" - height="29" - layout="topleft" - left_pad="10" - name="user_name" - text_color="white" - top="0" - value="(Loading...)" - use_ellipses="true" - width="275" /> + allow_scroll="false" + bg_visible="false" + read_only = "true" + follows="top|left|right" + font="SansSerifHugeBold" + height="29" + layout="topleft" + left_pad="10" + name="user_name" + text_color="white" + top="0" + value="(Loading...)" + use_ellipses="true" + width="275" /> <text follows="top|left" height="13" diff --git a/indra/newview/skins/default/xui/en/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/en/panel_script_limits_my_avatar.xml new file mode 100644 index 0000000000..d98f690339 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_script_limits_my_avatar.xml @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + border="true" + follows="top|left" + height="570" + label="MY AVATAR" + layout="topleft" + left="0" + name="script_limits_my_avatar_panel" + top="0" + width="480"> + <text + type="string" + length="1" + follows="left|top" + height="20" + layout="topleft" + left="10" + name="loading_text" + top="10" + text_color="EmphasisColor" + width="480"> + Loading... + </text> + <scroll_list + draw_heading="true" + follows="all" + height="500" + layout="topleft" + left_delta="0" + multi_select="true" + name="scripts_list" + top_delta="17" + width="460"> + <scroll_list.columns + label="Size (kb)" + name="size" + width="70" /> + <scroll_list.columns + label="URLs" + name="urls" + width="50" /> + <scroll_list.columns + label="Object Name" + name="name" + width="140" /> + <scroll_list.columns + label="Location" + name="location" + width="130" /> + </scroll_list> + <button + follows="bottom|left" + height="19" + label="Refresh List" + layout="bottomleft" + left_pad="5" + name="refresh_list_btn" + top="34" + left="10" + width="100" /> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/en/panel_script_limits_region_memory.xml new file mode 100644 index 0000000000..0fa3c1cf2e --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_script_limits_region_memory.xml @@ -0,0 +1,122 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + border="true" + follows="top|left" + height="570" + label="REGION MEMORY" + layout="topleft" + name="script_limits_region_memory_panel" + top="0" + left="0" + width="480"> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="10" + name="script_memory" + top_pad="24" + text_color="White" + width="480"> + Parcel Script Memory + </text> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="30" + name="parcels_listed" + top_delta="18" + visible="true" + width="480"> + Parcels Owned: + </text> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="30" + name="memory_used" + top_delta="18" + width="480"> + Memory used: + </text> + <text + type="string" + length="1" + follows="left|top" + height="20" + layout="topleft" + left="10" + name="loading_text" + top_delta="32" + text_color="EmphasisColor" + width="480"> + Loading... + </text> + <scroll_list + draw_heading="true" + follows="all" + height="409" + layout="topleft" + left_delta="0" + multi_select="true" + name="scripts_list" + top_delta="16" + width="460"> + <scroll_list.columns + label="Size (kb)" + name="size" + width="70" /> + <scroll_list.columns + label="Object Name" + name="name" + width="100" /> + <scroll_list.columns + label="Object Owner" + name="owner" + width="100" /> + <scroll_list.columns + label="Parcel / Location" + name="location" + width="130" /> +<!-- <scroll_list.commit_callback + function="TopObjects.CommitObjectsList" />--> + </scroll_list> + <button + follows="bottom|left" + height="19" + label="Refresh List" + layout="bottomleft" + left_pad="5" + name="refresh_list_btn" + top="34" + left="10" + width="100" /> + <button + follows="bottom|right" + height="19" + visible="false" + label="Highlight" + layout="bottomright" + left="370" + name="highlight_btn" + top="34" + width="100" /> + <button + follows="bottom|right" + height="19" + visible="false" + label="Return" + layout="bottomright" + name="return_btn" + top="34" + left_delta="-105" + width="100" /> +</panel> 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 3384852f27..4f40e00815 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 @@ -55,6 +55,7 @@ left_pad="5" right="-3" name="profile_btn" + tool_tip="Show item info" top="1" visible="false" width="20" /> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index ec4723bd55..9aae04ba38 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2041,6 +2041,59 @@ this texture in your inventory <string name="RegionInfoAllowedResidents">Allowed residents: ([ALLOWEDAGENTS], max [MAXACCESS])</string> <string name="RegionInfoAllowedGroups">Allowed groups: ([ALLOWEDGROUPS], max [MAXACCESS])</string> + <!-- script limits floater --> + <string name="ScriptLimitsParcelScriptMemory">Parcel Script Memory</string> + <string name="ScriptLimitsParcelsOwned">Parcels Listed: [PARCELS]</string> + <string name="ScriptLimitsMemoryUsed">Memory used: [COUNT] kb out of [MAX] kb; [AVAILABLE] kb available</string> + <string name="ScriptLimitsMemoryUsedSimple">Memory used: [COUNT] kb</string> + <string name="ScriptLimitsParcelScriptURLs">Parcel Script URLs</string> + <string name="ScriptLimitsURLsUsed">URLs used: [COUNT] out of [MAX]; [AVAILABLE] available</string> + <string name="ScriptLimitsURLsUsedSimple">URLs used: [COUNT]</string> + <string name="ScriptLimitsRequestError">Error requesting information</string> + <string name="ScriptLimitsRequestWrongRegion">Error: script information is only available in your current region</string> + <string name="ScriptLimitsRequestWaiting">Retrieving information...</string> + <string name="ScriptLimitsRequestDontOwnParcel">You do not have permission to examine this parcel</string> + + <string name="SITTING_ON">Sitting On</string> + <string name="ATTACH_CHEST">Chest</string> + <string name="ATTACH_HEAD">Head</string> + <string name="ATTACH_LSHOULDER">Left Shoulder</string> + <string name="ATTACH_RSHOULDER">Right Shoulder</string> + <string name="ATTACH_LHAND">Left Hand</string> + <string name="ATTACH_RHAND">Right Hand</string> + <string name="ATTACH_LFOOT">Left Foot</string> + <string name="ATTACH_RFOOT">Right Foot</string> + <string name="ATTACH_BACK">Back</string> + <string name="ATTACH_PELVIS">Pelvis</string> + <string name="ATTACH_MOUTH">Mouth</string> + <string name="ATTACH_CHIN">Chin</string> + <string name="ATTACH_LEAR">Left Ear</string> + <string name="ATTACH_REAR">Right Ear</string> + <string name="ATTACH_LEYE">Left Eye</string> + <string name="ATTACH_REYE">Right Eye</string> + <string name="ATTACH_NOSE">Nose</string> + <string name="ATTACH_RUARM">Right Upper Arm</string> + <string name="ATTACH_RLARM">Right Lower Arm</string> + <string name="ATTACH_LUARM">Left Upper Arm</string> + <string name="ATTACH_LLARM">Left Lower Arm</string> + <string name="ATTACH_RHIP">Right Hip</string> + <string name="ATTACH_RULEG">Right Upper Leg</string> + <string name="ATTACH_RLLEG">Right Lower Leg</string> + <string name="ATTACH_LHIP">Left Hip</string> + <string name="ATTACH_LULEG">Left Upper Leg</string> + <string name="ATTACH_LLLEG">Left Lower Leg</string> + <string name="ATTACH_BELLY">Belly</string> + <string name="ATTACH_RPEC">Right Pec</string> + <string name="ATTACH_LPEC">Left Pec</string> + <string name="ATTACH_HUD_CENTER_2">HUD Center 2</string> + <string name="ATTACH_HUD_TOP_RIGHT">HUD Top Right</string> + <string name="ATTACH_HUD_TOP_CENTER">HUD Top Center</string> + <string name="ATTACH_HUD_TOP_LEFT">HUD Top Left</string> + <string name="ATTACH_HUD_CENTER_1">HUD Center 1</string> + <string name="ATTACH_HUD_BOTTOM_LEFT">HUD Bottom Left</string> + <string name="ATTACH_HUD_BOTTOM">HUD Bottom</string> + <string name="ATTACH_HUD_BOTTOM_RIGHT">HUD Bottom Right</string> + <!-- script editor --> <string name="CursorPos">Line [LINE], Column [COLUMN]</string> @@ -2911,12 +2964,26 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="not_a_mod_error"> You are not a session moderator. </string> + <!--Some times string name is getting from the body of server response. + For ex.: from gIMMgr::showSessionStartError in the LLViewerChatterBoxSessionStartReply::post. + In case of the EXT-3562 issue 'muted' is passed into the gIMMgr::showSessionStartError as a string name. + So, let add string with name="muted" with the same value as "muted_error" --> + <string name="muted"> + A group moderator disabled your text chat. + </string> <string name="muted_error"> A group moderator disabled your text chat. </string> <string name="add_session_event"> Unable to add users to chat session with [RECIPIENT]. </string> + <!--Some times string name is getting from the body of server response. + For ex.: from gIMMgr::showSessionStartError in the LLViewerChatterBoxSessionStartReply::post. + In case of the EXT-3562 issue 'message' is passed into the gIMMgr::showSessionStartError as a string name. + So, let add string with name="message" with the same value as "message_session_event" --> + <string name="message"> + Unable to send your message to the chat session with [RECIPIENT]. + </string> <string name="message_session_event"> Unable to send your message to the chat session with [RECIPIENT]. </string> diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml index d7aa71a441..51f85e65e2 100644 --- a/indra/newview/skins/default/xui/en/widgets/button.xml +++ b/indra/newview/skins/default/xui/en/widgets/button.xml @@ -18,6 +18,6 @@ font="SansSerifSmall" hover_glow_amount="0.15" halign="center" - pad_bottom="2" + pad_bottom="3" scale_image="true"> </button> diff --git a/indra/newview/skins/default/xui/en/widgets/color_swatch.xml b/indra/newview/skins/default/xui/en/widgets/color_swatch.xml index 178c890c61..bda88857ae 100644 --- a/indra/newview/skins/default/xui/en/widgets/color_swatch.xml +++ b/indra/newview/skins/default/xui/en/widgets/color_swatch.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <color_swatch alpha_background_image="color_swatch_alpha.tga" - border_color="DefaultHighlightLight" + border_color="ColorSwatchBorderColor" name="color_swatch"> <color_swatch.caption_text name="caption" font="SansSerifSmall" 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 477c6fb8b8..3368fa88ef 100644 --- a/indra/newview/skins/default/xui/en/widgets/tab_container.xml +++ b/indra/newview/skins/default/xui/en/widgets/tab_container.xml @@ -1,9 +1,15 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<!-- +label_pad_bottom - vertical padding under tab button labels +label_pad_left - padding to the left of tab button labels +--> <tab_container tab_min_width="60" tab_max_width="150" - font_halign="center" + halign="center" font="SansSerifSmall" - tab_height="21"> + tab_height="21" + label_pad_bottom="2" + label_pad_left="4"> <first_tab tab_top_image_unselected="TabTop_Left_Off" tab_top_image_selected="TabTop_Left_Selected" tab_bottom_image_unselected="Toolbar_Left_Off" @@ -22,4 +28,4 @@ tab_bottom_image_selected="Toolbar_Right_Selected" tab_left_image_unselected="TabTop_Middle_Off" tab_left_image_selected="TabTop_Middle_Selected"/> -</tab_container>
\ No newline at end of file +</tab_container> diff --git a/indra/newview/skins/default/xui/en/widgets/teleport_history_menu_item.xml b/indra/newview/skins/default/xui/en/widgets/teleport_history_menu_item.xml index 6c559aa185..4f574d75d5 100644 --- a/indra/newview/skins/default/xui/en/widgets/teleport_history_menu_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/teleport_history_menu_item.xml @@ -3,6 +3,6 @@ Based on menu_item_call.xml --> <teleport_history_menu_item back_item_font="SansSerif" - current_item_font="SansSerif" + current_item_font="SansSerifBold" forward_item_font="SansSerif" /> diff --git a/indra/newview/skins/default/xui/en/widgets/text.xml b/indra/newview/skins/default/xui/en/widgets/text.xml index 5dd09e663b..855584a0db 100644 --- a/indra/newview/skins/default/xui/en/widgets/text.xml +++ b/indra/newview/skins/default/xui/en/widgets/text.xml @@ -11,7 +11,6 @@ allow_scroll="false" text_readonly_color="LabelDisabledColor" bg_writeable_color="FloaterDefaultBackgroundColor" - border_color="DefaultHighlightLight" use_ellipses="false" bg_visible="false" border_visible="false" |