diff options
Diffstat (limited to 'indra/newview/skins/default/xui/en')
35 files changed, 1338 insertions, 1204 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_aaa.xml b/indra/newview/skins/default/xui/en/floater_aaa.xml index 6598c95c0e..6ecdd76573 100644 --- a/indra/newview/skins/default/xui/en/floater_aaa.xml +++ b/indra/newview/skins/default/xui/en/floater_aaa.xml @@ -21,7 +21,7 @@ allow_html="true" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" - border_visible="true" + border_visible="false" follows="all" font="SansSerif" left="1" 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 05fc48f3a8..d1fd42bdd9 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -7,7 +7,7 @@ help_topic="floaterland" save_rect="true" title="ABOUT LAND" - width="460"> + width="490"> <floater.string name="Minutes"> [MINUTES] minutes @@ -25,25 +25,25 @@ remaining </floater.string> <tab_container - follows="left|top|right|bottom" - height="400" + follows="all" + height="410" layout="topleft" - left="1" + left="0" name="landtab" tab_position="top" - top="20" - width="459"> + tab_height="25" + tab_min_width="67" + top="10" + width="489"> <panel - border="true" - follows="left|top|right|bottom" - height="380" - label="General" + border="false" + follows="all" + label="GENERAL" layout="topleft" - left="1" + left="0" help_topic="land_general_tab" name="land_general_panel" - top="-31" - width="458"> + top="0"> <panel.string name="new users only"> New users only @@ -74,11 +74,11 @@ </panel.string> <panel.string name="profile_text"> - Profile... + Profile </panel.string> <panel.string name="info_text"> - Info... + Info </panel.string> <panel.string name="public_text"> @@ -95,7 +95,6 @@ <panel.string name="no_selection_text"> No parcel selected. -Go to World menu > About Land or select another parcel to show its details. </panel.string> <text type="string" @@ -103,32 +102,29 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="Name:" - top="4" - width="92"> + top="10" + width="100"> Name: </text> <line_editor - border_style="line" - border_thickness="1" - follows="left|top|right" + follows="left|top" height="16" layout="topleft" left_pad="2" max_length="63" name="Name" top_delta="0" - width="350" /> + width="365" /> <text type="string" length="1" follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="Description:" - top="24" width="100"> Description: </text> @@ -136,10 +132,10 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top|right" height="52" layout="topleft" - left_delta="92" + left_pad="2" name="Description" top_delta="0" - width="350" + width="365" word_wrap="true" /> <text type="string" @@ -147,10 +143,10 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="LandType" top="84" - width="92"> + width="100"> Type: </text> <text @@ -159,7 +155,7 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left_delta="92" + left_pad="2" name="LandTypeText" top_delta="0" width="250"> @@ -171,10 +167,9 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="ContentRating" - top="104" - width="92"> + width="100"> Rating: </text> <text @@ -183,7 +178,7 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left_delta="92" + left_pad="2" name="ContentRatingText" top_delta="0" width="250"> @@ -195,10 +190,10 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="Owner:" top="124" - width="92"> + width="100"> Owner: </text> <text @@ -207,71 +202,84 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left_delta="92" + left_pad="5" name="OwnerText" - top_delta="0" - width="250"> + width="240"> Leyla Linden </text> - <button + <button + follows="right" + height="16" + image_pressed="Info_Press" + image_unselected="Info_Over" + left_pad="3" + name="info_btn" + top_delta="-2" + width="16" /> + <!-- <button follows="left|top" height="16" - label="Profile..." - label_selected="Profile..." + label="Profile" layout="topleft" left_pad="4" name="Profile..." - top_delta="0" - width="90" /> + width="90" />--> <text type="string" length="1" follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="Group:" - top="144" - width="92"> + width="100"> Group: </text> + <!--TODO: HOOK UP GROUP ICON--> <text enabled="false" follows="left|top" height="16" + left_pad="5" layout="topleft" - left_delta="92" name="GroupText" - top_delta="2" - width="250" /> + width="240" /> + <button + follows="right" + height="16" + image_pressed="Info_Press" + image_unselected="Info_Over" + left_pad="3" + name="info_btn" + top_delta="-2" + width="16" /> <button follows="left|top" - height="16" - label="Set..." - label_selected="Set..." + height="23" + label="Set" layout="topleft" left_pad="4" + right="-10" name="Set..." - top_delta="-2" - width="90" /> + width="50" /> <check_box enabled="false" - height="16" + height="23" label="Allow Deed to Group" layout="topleft" left="96" name="check deed" tool_tip="A group officer can deed this land to the group, so it will be supported by the group's land allocation." top="164" - width="116" /> + width="146" /> <button enabled="false" follows="left|top" - height="16" - label="Deed..." - label_selected="Deed..." + height="23S" + label="Deed" layout="topleft" - left_pad="138" + left_pad="2" + right="-10" name="Deed..." tool_tip="You may only deed land if you are an officer in the selected group." top_delta="0" @@ -284,7 +292,6 @@ Go to World menu > About Land or select another parcel to show its details. left="96" name="check contrib" tool_tip="When the land is deeded to the group, the former owner contributes enough land allocation to support it." - top="184" width="199" /> <text type="string" @@ -292,10 +299,9 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="For Sale:" - top="204" - width="92"> + width="100"> For Sale: </text> <text @@ -304,11 +310,10 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left_delta="92" + left_pad="2" name="Not for sale." - top_delta="0" width="186"> - Not for sale. + Not for sale </text> <text type="string" @@ -318,9 +323,8 @@ Go to World menu > About Land or select another parcel to show its details. layout="topleft" left_delta="0" name="For Sale: Price L$[PRICE]." - top_delta="0" width="226"> - Price: L$[PRICE] (L$[PRICE_PER_SQM]/m²). + Price: L$[PRICE] (L$[PRICE_PER_SQM]/m²) </text> <text enabled="false" @@ -329,17 +333,16 @@ Go to World menu > About Land or select another parcel to show its details. layout="topleft" left_delta="0" name="SalePending" - top_pad="4" - width="344" /> + top_pad="6" + width="324" /> <button follows="left|top" - height="20" - label="Sell Land..." - label_selected="Sell Land..." + height="23" + label="Sell Land" layout="topleft" - left_delta="199" + left_pad="5" + right="-10" name="Sell Land..." - top_delta="0" width="145" /> <text type="string" @@ -349,7 +352,7 @@ Go to World menu > About Land or select another parcel to show its details. layout="topleft" left_delta="-199" name="For sale to" - top_delta="0" + top_delta="6" width="186"> For sale to: [BUYER] </text> @@ -361,9 +364,9 @@ Go to World menu > About Land or select another parcel to show its details. layout="topleft" left_delta="0" name="Sell with landowners objects in parcel." - top_pad="4" + top_pad="8" width="186"> - Objects included in sale. + Objects included in sale </text> <text type="string" @@ -375,17 +378,17 @@ Go to World menu > About Land or select another parcel to show its details. name="Selling with no objects in parcel." top_delta="0" width="186"> - Objects not included in sale. + Objects not included in sale </text> <button follows="left|top" - height="20" + height="23" label="Cancel Land Sale" label_selected="Cancel Land Sale" layout="topleft" - left="295" + right="-10" name="Cancel Land Sale" - top="228" + left_pad="5" width="145" /> <text type="string" @@ -393,10 +396,10 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="Claimed:" top="268" - width="92"> + width="100"> Claimed: </text> <text @@ -405,7 +408,7 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left_delta="92" + left_pad="2" name="DateClaimText" top_delta="0" width="186"> @@ -417,10 +420,10 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="PriceLabel" top="288" - width="92"> + width="100"> Area: </text> <text @@ -429,7 +432,7 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left_delta="92" + left_pad="2" name="PriceText" top_delta="0" width="186"> @@ -441,10 +444,10 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="Traffic:" top="308" - width="92"> + width="100"> Traffic: </text> <text @@ -453,7 +456,7 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left_delta="92" + left_pad="2" name="DwellText" top_delta="0" width="186"> @@ -462,31 +465,28 @@ Go to World menu > About Land or select another parcel to show its details. <button enabled="false" follows="left|top" - height="20" - label="Buy Land..." - label_selected="Buy Land..." + height="23" + label="Buy Land" layout="topleft" - left="155" + left_delta="82" name="Buy Land..." top="328" width="100" /> <button enabled="false" follows="left|top" - height="20" - label="Buy For Group..." - label_selected="Buy For Group..." + height="23" + label="Buy For Group" layout="topleft" - left="260" + right="-10" name="Buy For Group..." top="352" width="180" /> <button enabled="false" follows="left|top" - height="20" - label="Buy Pass..." - label_selected="Buy Pass..." + height="23" + label="Buy Pass" layout="topleft" left_delta="-105" name="Buy Pass..." @@ -495,30 +495,27 @@ Go to World menu > About Land or select another parcel to show its details. width="100" /> <button follows="left|top" - height="20" - label="Abandon Land..." - label_selected="Abandon Land..." + height="23" + label="Abandon Land" layout="topleft" - left="260" + right="-10" name="Abandon Land..." top="328" width="180" /> <button follows="left|top" - height="20" - label="Reclaim Land..." - label_selected="Reclaim Land..." + height="23" + label="Reclaim Land" layout="topleft" left_delta="0" name="Reclaim Land..." - top_delta="-48" + top_delta="-50" width="180" /> <button enabled="false" follows="left|top" - height="20" - label="Linden Sale..." - label_selected="Linden Sale..." + height="23" + label="Linden Sale" layout="topleft" left_delta="0" name="Linden Sale..." @@ -528,15 +525,13 @@ Go to World menu > About Land or select another parcel to show its details. </panel> <panel border="true" - follows="left|top|right|bottom" - height="380" - label="Covenant" + follows="all" + label="COVENANT" layout="topleft" - left_delta="-1" + left="0" + top="0" help_topic="land_covenant_tab" - name="land_covenant_panel" - top_delta="-47" - width="458"> + name="land_covenant_panel"> <panel.string name="can_resell"> Purchased land in this region may be resold. @@ -557,13 +552,12 @@ Go to World menu > About Land or select another parcel to show its details. type="string" length="1" follows="left|top" - font="SansSerif" - height="20" + height="16" layout="topleft" - left="5" + left="10" mouse_opaque="false" name="estate_section_lbl" - top="0" + top="10" width="100"> Estate: </text> @@ -571,38 +565,24 @@ Go to World menu > About Land or select another parcel to show its details. type="string" length="1" follows="left|top" - height="20" + height="16" layout="topleft" - left="10" - mouse_opaque="false" - name="estate_name_lbl" - top="20" - width="100"> - Name: - </text> - <text - type="string" - length="1" - follows="left|top" - height="20" - layout="topleft" - left_pad="10" + left_pad="0" mouse_opaque="false" name="estate_name_text" top_delta="0" - width="150"> + width="260"> mainland </text> <text type="string" length="1" follows="left|top" - height="20" + height="16" layout="topleft" left="10" mouse_opaque="false" name="estate_owner_lbl" - top="40" width="100"> Owner: </text> @@ -610,55 +590,52 @@ Go to World menu > About Land or select another parcel to show its details. type="string" length="1" follows="left|top" - height="20" + height="16" layout="topleft" - left_pad="10" + left_pad="0" mouse_opaque="false" name="estate_owner_text" - top_delta="0" - width="150"> + width="300"> (none) </text> <text_editor type="string" length="1" enabled="false" - follows="left|top|right|bottom" - handle_edit_keys_directly="true" - height="115" + follows="all" + handle_edit_keys_directly="true" + height="200" layout="topleft" - left_delta="0" + left="10" max_length="65535" name="covenant_editor" - top_delta="20" - width="330" + width="470" word_wrap="true"> There is no Covenant provided for this Estate. </text_editor> <text type="string" length="1" - follows="left|top" - height="20" + follows="right|top" + height="16" + halign="right" layout="topleft" - left_delta="0" + right="-10" + top_pad="0" mouse_opaque="false" name="covenant_timestamp_text" - top_pad="55" - width="250"> + width="460"> Last Modified Wed Dec 31 16:00:00 1969 </text> <text type="string" length="1" follows="left|top" - font="SansSerif" - height="20" + height="16" layout="topleft" - left="5" + left="10" mouse_opaque="false" name="region_section_lbl" - top="250" width="100"> Region: </text> @@ -666,38 +643,23 @@ Go to World menu > About Land or select another parcel to show its details. type="string" length="1" follows="left|top" - height="20" - layout="topleft" - left="10" - mouse_opaque="false" - name="region_name_lbl" - top="270" - width="100"> - Name: - </text> - <text - type="string" - length="1" - follows="left|top" - height="20" + height="16" layout="topleft" left_pad="10" mouse_opaque="false" name="region_name_text" - top_delta="0" width="150"> - leyla + EricaVille </text> <text type="string" length="1" follows="left|top" - height="20" + height="16" layout="topleft" left="10" mouse_opaque="false" name="region_landtype_lbl" - top="290" width="100"> Type: </text> @@ -705,12 +667,11 @@ Go to World menu > About Land or select another parcel to show its details. type="string" length="1" follows="left|top" - height="20" + height="16" layout="topleft" left_pad="10" mouse_opaque="false" name="region_landtype_text" - top_delta="0" width="150"> Mainland / Homestead </text> @@ -718,12 +679,11 @@ Go to World menu > About Land or select another parcel to show its details. type="string" length="1" follows="left|top" - height="20" + height="16" layout="topleft" left="10" mouse_opaque="false" name="region_maturity_lbl" - top="310" width="100"> Rating: </text> @@ -731,12 +691,11 @@ Go to World menu > About Land or select another parcel to show its details. type="string" length="1" follows="left|top" - height="20" + height="16" layout="topleft" left_pad="10" mouse_opaque="false" name="region_maturity_text" - top_delta="0" width="150"> Adult </text> @@ -744,12 +703,11 @@ Go to World menu > About Land or select another parcel to show its details. type="string" length="1" follows="left|top" - height="20" + height="16" layout="topleft" left="10" mouse_opaque="false" name="resellable_lbl" - top="330" width="100"> Resale: </text> @@ -757,12 +715,11 @@ Go to World menu > About Land or select another parcel to show its details. type="string" length="1" follows="left|top" - height="20" + height="16" layout="topleft" left_pad="10" mouse_opaque="false" name="resellable_clause" - top_delta="0" width="330"> Land in this region may not be resold. </text> @@ -770,12 +727,11 @@ Go to World menu > About Land or select another parcel to show its details. type="string" length="1" follows="left|top" - height="20" + height="30" layout="topleft" left="10" mouse_opaque="false" name="changeable_lbl" - top="350" width="100"> Subdivide: </text> @@ -788,22 +744,20 @@ Go to World menu > About Land or select another parcel to show its details. left_pad="10" mouse_opaque="false" name="changeable_clause" - top_delta="0" + word_wrap="true" width="330"> Land in this region may not be joined/subdivided. </text> </panel> <panel border="true" - follows="left|top|right|bottom" - height="380" - label="Objects" + follows="all" + label="OBJECTS" layout="topleft" - left_delta="0" + left="0" + top="0" help_topic="land_objects_tab" - name="land_objects_panel" - top_delta="-47" - width="458"> + name="land_objects_panel"> <panel.string name="objects_available_text"> [COUNT] out of [MAX] ([AVAILABLE] available) @@ -818,7 +772,7 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="parcel_object_bonus" top="4" visible="false" @@ -835,7 +789,7 @@ Go to World menu > About Land or select another parcel to show its details. name="Simulator primitive usage:" top_pad="4" width="364"> - Simulator primitive usage: + Primative usage: </text> <text type="string" @@ -855,11 +809,11 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="Primitives parcel supports:" top="44" width="152"> - Primitives parcel supports: + Prims parcel supports: </text> <text type="string" @@ -879,11 +833,11 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="Primitives on parcel:" top="64" width="152"> - Primitives on parcel: + Prims on parcel: </text> <text type="string" @@ -925,7 +879,7 @@ Go to World menu > About Land or select another parcel to show its details. bottom="100" enabled="false" follows="left|top" - height="16" + height="20" label="Show" label_selected="Show" layout="topleft" @@ -936,9 +890,8 @@ Go to World menu > About Land or select another parcel to show its details. bottom="100" enabled="false" follows="left|top" - height="16" - label="Return..." - label_selected="Return..." + height="20" + label="Return" layout="topleft" name="ReturnOwner..." right="-10" @@ -972,8 +925,8 @@ Go to World menu > About Land or select another parcel to show its details. bottom="120" enabled="false" follows="left|top" - height="16" label="Show" + height="20" label_selected="Show" layout="topleft" name="ShowGroup" @@ -983,9 +936,8 @@ Go to World menu > About Land or select another parcel to show its details. bottom="120" enabled="false" follows="left|top" - height="16" - label="Return..." - label_selected="Return..." + height="20" + label="Return" layout="topleft" name="ReturnGroup..." right="-10" @@ -1019,7 +971,7 @@ Go to World menu > About Land or select another parcel to show its details. bottom="140" enabled="false" follows="left|top" - height="16" + height="20" label="Show" label_selected="Show" layout="topleft" @@ -1030,9 +982,8 @@ Go to World menu > About Land or select another parcel to show its details. bottom="140" enabled="false" follows="left|top" - height="16" - label="Return..." - label_selected="Return..." + height="20" + label="Return" layout="topleft" name="ReturnOther..." right="-10" @@ -1068,7 +1019,7 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="Autoreturn" top="164" width="294"> @@ -1091,44 +1042,43 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="Object Owners:" top="184" width="104"> Object Owners: </text> - <button - follows="left|top" - height="16" - label="Refresh List" - label_selected="Refresh List" - layout="topleft" - left_delta="104" - name="Refresh List" - top_delta="0" - width="106" /> + <button + follows="top|right" + height="20" + image_overlay="Refresh_Off" + layout="topleft" + name="Refresh List" + left_pad="5" + right="-183" + tool_tip="Refresh Object List" + width="20" /> <button enabled="false" follows="left|top" - height="16" - label="Return objects..." - label_selected="Return objects..." + height="20" + label="Return Objects" layout="topleft" left_pad="6" name="Return objects..." top_delta="0" + right="-10" width="164" /> <name_list column_padding="0" draw_heading="true" - follows="left|top|right|bottom" - height="165" + follows="all" + height="190" layout="topleft" - left="4" + left="10" name="owner list" name_column="name" - top="210" - width="450"> + width="470"> <name_list.columns label="Type" name="type" @@ -1153,15 +1103,13 @@ Go to World menu > About Land or select another parcel to show its details. </panel> <panel border="true" - follows="left|top|right|bottom" - height="333" - label="Options" + follows="all" + label="OPTIONS" layout="topleft" - left_delta="0" help_topic="land_options_tab" name="land_options_panel" - top_delta="31" - width="458"> + left="0" + top="0"> <panel.string name="search_enabled_tooltip"> Let people see this parcel in search results @@ -1207,11 +1155,12 @@ Only large parcels can be listed in search. type="string" length="1" follows="left|top" + text_color="white" height="16" layout="topleft" - left="4" + left="10" name="allow_label" - top="4" + top="10" width="278"> Allow other residents to: </text> @@ -1222,44 +1171,40 @@ Only large parcels can be listed in search. left="14" name="edit land check" tool_tip="If checked, anyone can terraform your land. It is best to leave this unchecked, as you can always edit your own land." - top="24" - width="268" /> + top_pad="4" + width="147i" /> <check_box height="16" label="Fly" layout="topleft" - left_delta="0" name="check fly" tool_tip="If checked, Residents can fly on your land. If unchecked, they can only fly into and over your land." - top_pad="4" - width="268" /> + left_pad="4" + width="150" /> <text type="string" length="1" follows="left|top" height="16" layout="topleft" - left="178" + left="14" name="allow_label2" - top="24" - width="104"> - Create Objects: + width="150"> + Build: </text> <check_box height="16" - label="All Residents" + label="Everyone" layout="topleft" - left_delta="92" + left_pad="2" name="edit objects check" - top_delta="0" - width="104" /> + width="120" /> <check_box height="16" label="Group" layout="topleft" - left_delta="100" + left_pad="2" name="edit group objects check" - top_delta="0" width="70" /> <text type="string" @@ -1267,17 +1212,16 @@ Only large parcels can be listed in search. follows="left|top" height="16" layout="topleft" - left="178" + left="14" name="allow_label3" - top="44" - width="124"> + width="150"> Object Entry: </text> <check_box height="16" - label="All Residents" + label="Everyone" layout="topleft" - left_delta="92" + left_pad="2" name="all object entry check" top_delta="0" width="120" /> @@ -1285,7 +1229,7 @@ Only large parcels can be listed in search. height="16" label="Group" layout="topleft" - left_delta="100" + left_pad="2" name="group object entry check" top_delta="0" width="70" /> @@ -1295,17 +1239,16 @@ Only large parcels can be listed in search. follows="left|top" height="16" layout="topleft" - left="178" + left="14" name="allow_label4" - top="64" - width="124"> + width="150"> Run Scripts: </text> <check_box height="16" - label="All Residents" + label="Everyone" layout="topleft" - left_delta="92" + left_pad="2" name="check other scripts" top_delta="0" width="120" /> @@ -1313,19 +1256,19 @@ Only large parcels can be listed in search. height="16" label="Group" layout="topleft" - left_delta="100" + left_pad="2" name="check group scripts" top_delta="0" width="70" /> <text type="string" + text_color="white" length="1" follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="land_options_label" - top="84" width="278"> Land Options: </text> @@ -1336,33 +1279,31 @@ Only large parcels can be listed in search. left="14" name="check safe" tool_tip="If checked, sets the land to Safe, disabling damage combat. If cleared, damage combat is enabled." - top="104" - width="268" /> + top_pad="5" + width="200" /> <check_box height="16" label="No Pushing" layout="topleft" - left_delta="164" + left_pad="5" name="PushRestrictCheck" tool_tip="Prevents scripts from pushing. Checking this option may be useful for preventing disruptive behavior on your land." top_delta="0" width="119" /> <check_box height="16" - label="Show Place in Search (L$30/week) under" + label="Show Place in Search (L$30/week)" layout="topleft" left="14" name="ShowDirectoryCheck" tool_tip="Let people see this parcel in search results" - top="124" - width="268" /> + width="430" /> <combo_box enabled="false" - height="18" + height="20" layout="topleft" - left_delta="241" + left="30" name="land category with adult" - top_delta="-2" visible="false" width="130"> <combo_box.item @@ -1420,11 +1361,10 @@ Only large parcels can be listed in search. </combo_box> <combo_box enabled="false" - height="18" + height="20" layout="topleft" - left_delta="0" + left="30" name="land category" - top_delta="0" visible="false" width="130"> <combo_box.item @@ -1482,8 +1422,8 @@ Only large parcels can be listed in search. layout="topleft" left="14" name="MatureCheck" + top="177" tool_tip=" " - top="144" width="107" /> <text type="string" @@ -1491,74 +1431,75 @@ Only large parcels can be listed in search. follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="Snapshot:" - top="164" - width="278"> + text_color="white" + top="220" + width="200"> Snapshot: </text> <texture_picker follows="left|top" - height="135" + height="150" layout="topleft" - left_delta="72" + left="14" name="snapshot_ctrl" tool_tip="Click to choose a picture" - top_delta="0" - width="180" /> + width="195" /> <text type="string" length="1" follows="left|top" - height="16" + height="30" layout="topleft" - left="4" + left="220" + top="180" + text_color="white" name="landing_point" - top="287" - width="278"> + word_wrap="true" + width="200"> Landing Point: [LANDING] </text> <button - follows="left|top" - height="16" + follows="right|top" + height="23" label="Set" label_selected="Set" layout="topleft" - left_delta="232" name="Set" + right="-68" tool_tip="Sets the landing point where visitors arrive. Sets to your avatar's location inside this parcel." - top_delta="0" width="50" /> <button - follows="left|top" - height="16" + follows="right|top" + height="23" label="Clear" label_selected="Clear" layout="topleft" left_pad="5" name="Clear" tool_tip="Clear the landing point" - top_delta="0" + right="-10" width="50" /> <text type="string" length="1" + text_color="white" follows="left|top" height="16" layout="topleft" - left="4" + left="220" + top_pad="10" name="Teleport Routing: " - top="307" - width="278"> + width="200"> Teleport Routing: </text> <combo_box - height="18" + height="23" layout="topleft" - left_delta="116" name="landing type" + top_pad="3" tool_tip="Teleport Routing -- select how to handle teleports onto your land" - top_delta="0" width="120"> <combo_box.item enabled="true" @@ -1579,34 +1520,31 @@ Only large parcels can be listed in search. </panel> <panel border="true" - follows="left|top|right|bottom" - height="363" - label="Media" + follows="all" + label="MEDIA" layout="topleft" - left_delta="0" + left="0" + top="0" help_topic="land_media_tab" - name="land_media_panel" - top_delta="1" - width="458"> + name="land_media_panel"> <text type="string" length="1" follows="left|top" - height="16" + height="20" layout="topleft" left="10" name="with media:" - top="9" - width="65"> + top="10" + width="100"> Type: </text> <combo_box - height="18" + height="20" layout="topleft" - left_pad="5" + left_pad="0" name="media type" tool_tip="Specify if the URL is a movie, web page, or other media" - top_delta="-2" width="120" /> <text follows="left|top" @@ -1614,79 +1552,70 @@ Only large parcels can be listed in search. layout="topleft" left_pad="10" name="mime_type" - top_delta="2" width="200" /> <text type="string" length="1" follows="left|top" - height="16" + height="20" layout="topleft" left="10" name="at URL:" - top="29" - width="65"> + width="100"> Home URL: </text> <line_editor - bottom_delta="0" follows="left|top" - height="16" + height="20" layout="topleft" - left="80" + left_pad="0" max_length="255" name="media_url" - right="-80" select_on_focus="true" - text_readonly_color="0.576471 0.662745 0.835294 1" /> + width="300" /> <button - follows="left|top" - height="16" - label="Set..." - label_selected="Set..." + follows="right|top" + height="22" + label="Set" layout="topleft" - left_pad="8" + left_pad="5" + right="-10" name="set_media_url" - top_delta="0" - width="60" /> + width="50" /> <text type="string" length="1" follows="left|top" - height="16" + height="20" layout="topleft" left="10" name="CurrentURL:" - top="49" - width="65"> + width="100"> Current URL: </text> + <button + follows="top|right" + height="20" + image_overlay="Refresh_Off" + layout="topleft" + name="reset_media_url" + left_pad="0" + tool_tip="Refresh URL" + width="20" /> <text follows="left|top" height="16" layout="topleft" - left_pad="5" + left_pad="10" name="current_url" - top_delta="0" width="300" /> - <button - follows="left|top" - height="16" - label="Reset..." - label_selected="Reset..." - layout="topleft" - left_pad="6" - name="reset_media_url" - top_delta="0" - width="60" /> <check_box height="16" label="Hide URL" layout="topleft" - left="100" + left="110" name="hide_media_url" tool_tip="Checking this option will hide the media url to any non-authorized viewers of this parcel information. Note this is not available for HTML types." - top="89" width="200" /> <text type="string" @@ -1696,23 +1625,20 @@ Only large parcels can be listed in search. layout="topleft" left="10" name="Description:" - top="49" width="364"> Description: </text> <line_editor - border_style="line" - border_thickness="1" - bottom_delta="0" follows="left|top" - height="16" + height="20" layout="topleft" - left="80" + left="110" max_length="255" name="url_description" - right="-80" select_on_focus="true" - tool_tip="Text displayed next to play/load button" /> + tool_tip="Text displayed next to play/load button" + top_delta="10" + width="300" /> <text type="string" length="1" @@ -1721,10 +1647,10 @@ Only large parcels can be listed in search. layout="topleft" left="10" name="Media texture:" - top="69" - width="364"> - Replace -Texture: + top_pad="10" + width="364" + word_wrap="true"> + Replace Texture: </text> <texture_picker allow_no_texture="true" @@ -1732,46 +1658,44 @@ Texture: follows="left|top" height="80" layout="topleft" - left_delta="70" + left="110" name="media texture" tool_tip="Click to choose a picture" - top_delta="0" + top_delta="10" width="64" /> <text type="string" length="1" follows="left|top" - height="16" + height="80" layout="topleft" - left_delta="75" + left_pad="8" name="replace_texture_help" - top="85" - width="270"> - Objects using this texture will show the movie or - web page after you click the play arrow. + 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. +Select the thumbnail to choose a different texture. </text> <check_box height="16" label="Auto scale" layout="topleft" - left_delta="70" + left="110" name="media_auto_scale" + top_pad="0" tool_tip="Checking this option will scale the content for this parcel automatically. It may be slightly slower and lower quality visually but no other texture scaling or alignment will be required." - top_delta="0" width="200" /> <text type="string" length="1" follows="left|top" - height="16" + height="20" layout="topleft" - left="85" + left="10" name="media_size" tool_tip="Size to render Web media, leave 0 for default." - top="185" - width="85"> + width="100"> Size: </text> <spinner @@ -1779,11 +1703,11 @@ Texture: enabled="false" follows="left|top" halign="right" - height="16" + height="20" increment="1" initial_value="0" layout="topleft" - left_delta="65" + left_pad="0" max_val="1024" name="media_size_width" tool_tip="Size to render Web media, leave 0 for default." @@ -1794,7 +1718,7 @@ Texture: enabled="false" follows="left|top" halign="right" - height="16" + height="20" increment="1" initial_value="0" layout="topleft" @@ -1811,7 +1735,7 @@ Texture: follows="left|top" height="16" layout="topleft" - left_delta="70" + left_pad="5" name="pixels" right="-10"> pixels @@ -1824,15 +1748,15 @@ Texture: layout="topleft" left="10" name="Options:" - top="237" - width="292"> + top_pad="8" + width="100"> Options: </text> <check_box height="16" label="Loop" layout="topleft" - left_delta="70" + left_pad="0" name="media_loop" tool_tip="Play media in a loop. When the media has finished playing, it will restart from the beginning." top_delta="0" @@ -1840,15 +1764,13 @@ Texture: </panel> <panel border="true" - follows="left|top|right|bottom" - height="363" - label="Audio" + follows="all" + label="SOUND" layout="topleft" - left_delta="0" + left="0" + top="0" help_topic="land_audio_tab" - name="land_audio_panel" - top_delta="1" - width="458"> + name="land_audio_panel"> <text type="string" length="1" @@ -1856,21 +1778,19 @@ Texture: height="16" layout="topleft" left="10" + top="10" name="MusicURL:" - top="225" width="364"> Music URL: </text> <line_editor - border_style="line" - border_thickness="1" - bottom_delta="0" follows="left|top" - height="16" + height="20" layout="topleft" - left="80" + left="100" max_length="255" name="music_url" + top_pad="0" right="-15" select_on_focus="true" /> <text @@ -1881,17 +1801,16 @@ Texture: layout="topleft" left="10" name="Sound:" - top="265" - width="364"> + top_pad="10" + width="100"> Sound: </text> <check_box height="16" label="Restrict gesture and object sounds to this parcel" layout="topleft" - left_delta="70" name="check sound local" - top_delta="0" + left_pad="0" width="292" /> <text type="string" @@ -1902,47 +1821,42 @@ Texture: left="10" mouse_opaque="false" name="Voice settings:" - top="305" - width="364"> + top_pad="10" + width="100"> Voice: </text> <check_box - height="54" + height="16" label="Enable Voice" layout="topleft" - left="80" + left_pad="0" name="parcel_enable_voice_channel" - top="267" - width="463" /> + width="300" /> <check_box enabled="false" - height="54" + height="16" label="Enable Voice (established by the Estate)" layout="topleft" - left_delta="0" + left="110" name="parcel_enable_voice_channel_is_estate_disabled" - top_delta="0" - width="463" /> + width="300" /> <check_box - height="54" + height="16" label="Restrict Voice to this parcel" layout="topleft" - left="100" + left="110" name="parcel_enable_voice_channel_parcel" - top="287" - width="443" /> + width="300" /> </panel> <panel border="true" - follows="left|top|right|bottom" - height="333" - label="Access" + follows="all" + label="ACCESS" layout="topleft" - left_delta="0" + left="0" + top="0" help_topic="land_access_tab" - name="land_access_panel" - top_delta="31" - width="458"> + name="land_access_panel"> <panel.string name="estate_override"> One or more of these options is set at the estate level @@ -1951,13 +1865,13 @@ Texture: type="string" length="1" follows="left|top" - font="SansSerif" - height="20" + height="16" layout="topleft" - left="8" + left="10" name="Limit access to this parcel to:" - top="4" - width="278"> + text_color="White" + top="10" + width="400"> Access To This Parcel </text> <check_box @@ -2012,7 +1926,7 @@ Texture: width="278" /> <check_box enabled="false" - height="16" + height="22" label="Sell passes to:" layout="topleft" left_delta="0" @@ -2021,7 +1935,7 @@ Texture: top_pad="4" width="120" /> <combo_box - height="16" + height="20" layout="topleft" left_pad="22" name="pass_combo" @@ -2039,7 +1953,7 @@ Texture: <spinner enabled="false" follows="left|top" - height="16" + height="22" increment="1" initial_value="10" label="Price in L$:" @@ -2049,12 +1963,12 @@ Texture: max_val="500" min_val="1" name="PriceSpin" - top="149" - width="180" /> + top_pad="5" + width="200" /> <spinner enabled="false" follows="left|top" - height="16" + height="22" increment="0.25" initial_value="1" label="Hours of access:" @@ -2064,8 +1978,15 @@ Texture: max_val="24" min_val="0.01" name="HoursSpin" - top_pad="4" - width="180" /> + top_pad="5" + width="200" /> + <panel + name="Allowed_layout_panel" + follows="top|left" + left="10" + height="170" + top_pad="8" + width="240"> <text type="string" length="1" @@ -2073,44 +1994,48 @@ Texture: height="16" label="Always Allow" layout="topleft" - left="20" + left="0" name="AllowedText" - top="204" - width="195"> + top="0" + width="230"> Allowed Residents </text> <name_list column_padding="0" follows="top|bottom" heading_height="14" - height="80" + height="120" layout="topleft" - left_delta="0" + left="0" multi_select="true" name="AccessList" tool_tip="([LISTED] listed, [MAX] max)" - top_pad="4" - width="195" /> + width="240" /> <button follows="bottom" - height="16" - label="Add..." - label_selected="Add..." + height="23" + label="Add" layout="topleft" - left_delta="5" + left="0" name="add_allowed" - top="308" - width="80" /> + width="100" /> <button follows="bottom" - height="16" + height="23" label="Remove" label_selected="Remove" layout="topleft" - left_pad="20" + left_pad="10" name="remove_allowed" - top_delta="0" - width="80" /> + right="-1" + width="100" /> + </panel> + <panel + name="Banned_layout_panel" + follows="top|right" + height="170" + width="240" + left_pad="8"> <text type="string" length="1" @@ -2118,45 +2043,43 @@ Texture: height="16" label="Ban" layout="topleft" - left="240" + left="0" name="BanCheck" - top="204" - width="195"> + top="0" + width="200"> Banned Residents </text> <name_list column_padding="0" follows="top|bottom" heading_height="14" - height="80" + height="120" layout="topleft" - left_delta="0" + left="0" multi_select="true" name="BannedList" tool_tip="([LISTED] listed, [MAX] max)" - top_pad="4" - width="195" /> + width="240" /> <button follows="bottom" - height="16" - label="Add..." - label_selected="Add..." + height="23" + label="Add" layout="topleft" - left_delta="5" + left="0" name="add_banned" - top="308" - width="80" /> + width="100" /> <button enabled="false" follows="bottom" - height="16" + height="23" label="Remove" label_selected="Remove" layout="topleft" - left_pad="20" + left_pad="10" name="remove_banned" - top_delta="0" - width="80" /> + right="-1" + width="100" /> + </panel> </panel> </tab_container> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_help_browser.xml b/indra/newview/skins/default/xui/en/floater_help_browser.xml index f50ff01230..55a6179afb 100644 --- a/indra/newview/skins/default/xui/en/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/en/floater_help_browser.xml @@ -43,6 +43,7 @@ left="0" name="browser" top="0" + start_url="data:text/html,%3Chtml%3E%3Cbody bgcolor=%22#2A2A2A%22%3E%3C/body%3E%3C/html%3E" width="570" /> <button follows="bottom|left" diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml index cf6a4e45bd..cd297af99d 100644 --- a/indra/newview/skins/default/xui/en/floater_im_container.xml +++ b/indra/newview/skins/default/xui/en/floater_im_container.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<multi_floater
-background_visible="true"
-bg_color="yellow"
+ can_minimize="false"
can_resize="true"
height="390"
layout="topleft"
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 d0632940b6..c8aab2c1e0 100644 --- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml +++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml @@ -29,13 +29,15 @@ bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" follows="all" - left="1" + left="5" top="20" layout="topleft" - height="280" + height="275" name="chat_history" parse_highlights="true" text_color="ChatHistoryTextColor" text_readonly_color="ChatHistoryTextColor" - width="320" /> + right_widget_pad="5" + left_widget_pad="0" + width="315" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml index d9498586af..d363452204 100644 --- a/indra/newview/skins/default/xui/en/floater_search.xml +++ b/indra/newview/skins/default/xui/en/floater_search.xml @@ -47,6 +47,7 @@ left="0" name="browser" top="0" + start_url="data:text/html,%3Chtml%3E%3Cbody bgcolor=%22#2A2A2A%22%3E%3C/body%3E%3C/html%3E" width="570" /> <text follows="bottom|left" diff --git a/indra/newview/skins/default/xui/en/floater_test_text_editor.xml b/indra/newview/skins/default/xui/en/floater_test_text_editor.xml new file mode 100644 index 0000000000..b0aa5c7c4f --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_test_text_editor.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + can_resize="true" + height="600" + layout="topleft" + name="floater_test_text_editor" + width="800"> + <text_editor + height="50" + follows="top|left|bottom" + layout="topleft" + left="10" + name="test_text_editor" + tool_tip="text editor" + top="25" + width="200"> + Text Editor + </text_editor> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_test_textbox.xml b/indra/newview/skins/default/xui/en/floater_test_textbox.xml index 310ad13dac..8fc2677cbe 100644 --- a/indra/newview/skins/default/xui/en/floater_test_textbox.xml +++ b/indra/newview/skins/default/xui/en/floater_test_textbox.xml @@ -21,6 +21,21 @@ Third line of multiple lines Fourth line of multiple lines Fifth line of multiple lines </text> + <text + clip_partial="true" + top_pad="10" + left="10" + width="267" + height="28" + layout="topleft" + follows="right|left" + text_color="white" + use_ellipses="true" + word_wrap="true" + mouse_opaque="false" + name="title" > + This text has word_wrap set true, use_ellipses set true, and clip_partial set true, so it should wrap around, spilling over to the last line, then clip the last partial line and show ellipses to indicate there is more text + </text> <text font="SansSerif" @@ -28,7 +43,7 @@ Fifth line of multiple lines height="10" layout="topleft" left_delta="0" - top_pad="40" + top_pad="10" width="300"> SansSerif BOLD </text> @@ -174,6 +189,53 @@ scroll bar word_wrap="true"> Second Life is brought to you by Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les and many others. </text_editor> + <text_editor + height="50" + follows="top|left|bottom" + font="Monospace" + left_delta="0" + name="monospace_text_editor" + tool_tip="text editor" + top_pad="10" + width="200"> +Text Editor +with multiple +lines of text +and hence a +scroll bar gjyrrr + </text_editor> + <text_editor + border_visible="true" + height="50" + follows="top|left|bottom" + font="Monospace" + left_delta="0" + name="monospace_text_editor" + tool_tip="text editor" + top_pad="10" + width="200"> +Text Editor +with multiple +lines of text +and hence a +scroll bar gjyrrr + </text_editor> + <text_editor + height="50" + follows="top|left|bottom" + font="SansSerif" + left_delta="0" + name="sansserif_text_editor" + tool_tip="text editor" + top_pad="10" + width="200"> +Text Editor +with multiple +lines of text +and hence a +scroll bar gjyrrr + </text_editor> + <text height="40" follows="top|left|bottom" 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 04696ca2e7..1ebc51f504 100644 --- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml @@ -1,8 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater can_resize="true" - height="300" + height="270" layout="topleft" + min_height="146" + min_width="190" name="floater_voice_controls" title="Voice Controls" save_visibility="true" @@ -21,6 +23,10 @@ Conference Call </string> <string + name="title_peer_2_peer"> + Call with [NAME] + </string> + <string name="no_one_near"> No one near </string> @@ -74,6 +80,7 @@ width="20" /> </panel> <layout_stack + animate="false" bottom="10" clip="false" follows="left|right|top" @@ -82,9 +89,11 @@ orientation="horizontal" width="262"> <layout_panel + auto_resize="false" follows="left" layout="topleft" min_width="24" + name="microphone_icon_panel" top="0" user_resize="false" width="24"> @@ -98,9 +107,10 @@ </layout_panel> <layout_panel layout="topleft" + name="volume_slider_panel" top="0" user_resize="false" - width="258"> + width="138"> <slider_bar control_name="AudioLevelMic" follows="left|right|top" @@ -113,7 +123,25 @@ tool_tip="Master Volume" top="0" value="0.75" - width="258" /> + width="138" /> + </layout_panel> + <layout_panel + auto_resize="false" + layout="topleft" + min_width="100" + name="leave_btn_panel" + top="0" + user_resize="false" + visible="false" + width="100"> + <button + follows="left|right|top" + height="24" + label="Leave Call" + left="0" + name="leave_call_btn" + top="0" + width="100" /> </layout_panel> </layout_stack> </panel> @@ -126,4 +154,13 @@ multi_select="true" name="speakers_list" width="282" /> + <panel + filename="panel_avatar_list_item.xml" + follows="left|right|top" + height="24" + layout="topleft" + left="0" + name="non_avatar_caller" + top="70" + width="282" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml index ea417b4990..9c11a88c34 100644 --- a/indra/newview/skins/default/xui/en/floater_world_map.xml +++ b/indra/newview/skins/default/xui/en/floater_world_map.xml @@ -4,7 +4,7 @@ can_resize="true" center_horiz="true" center_vert="true" - height="600" + height="535" layout="topleft" min_height="520" min_width="520" @@ -17,388 +17,493 @@ width="800"> <panel filename="panel_world_map.xml" - follows="left|top|right|bottom" - height="565" + follows="all" + height="500" layout="topleft" - left="15" + left="10" name="objects_mapview" top="25" width="542" /> - <icon - follows="top|right" - height="16" - image_name="map_avatar_16.tga" - layout="topleft" - left="-230" - mouse_opaque="true" - name="self" - top="34" - width="16" /> + <panel + name="layout_panel_1" + height="22" + width="238" + follows="right|top" + top="25" + left_pad="5" + background_visible="true" + bg_alpha_color="DkGray2"> <text + text_color="White" + font="SansSerifLarge" type="string" length="1" follows="top|right" + halign="left" height="16" layout="topleft" - left_pad="4" - name="you_label" - top_delta="0" - width="145"> - You + left="15" + name="events_label" + top="3" + width="215"> + Legend </text> - <icon - follows="top|right" - height="16" - image_name="map_home.tga" + </panel> +<panel + follows="right|top" + height="126" + top_pad="0" + width="238"> +<button + follows="right|top" + height="22" + image_overlay="map_avatar_16.tga" + scale_image="true" + left="4" layout="topleft" - left_delta="50" - mouse_opaque="true" - name="home" - top_delta="0" - width="16" /> - <text + name="Show My Location" + tool_tip="Center map on your avatar's location" + top="6" + width="24" > + <button.commit_callback + function="WMap.ShowAgent" /> + </button> + <text type="string" length="1" follows="top|right" - height="16" + halign="left" + height="13" + top_delta="6" + left_pad="5" layout="topleft" - left_pad="4" - name="home_label" - top_delta="0" - width="145"> - Home + name="person_label" + width="90"> + Me </text> - <icon - color="0.5 0.25 1 1" + <check_box + control_name="MapShowPeople" follows="top|right" height="16" - image_name="legend.tga" layout="topleft" - left="-230" + left="3" + name="people_chk" + top_pad="9" + width="22" /> + <icon + color="0 1 0 1" + follows="top|right" + height="8" + image_name="map_avatar_8.tga" + layout="topleft" + left_pad="3" mouse_opaque="true" - name="square2" - top="54" - width="16" /> - <text + name="person" + top_delta="3" + width="8" /> + <text type="string" length="1" follows="top|right" + halign="left" height="16" + top_delta="-2" + left_pad="7" layout="topleft" - left_pad="4" - name="auction_label" - top_delta="0" - width="145"> - Auction + name="person_label" + width="90"> + Person </text> - <icon - color="1 1 0.25 1" + <check_box + control_name="MapShowInfohubs" follows="top|right" height="16" - image_name="legend.tga" layout="topleft" - left_delta="50" + left="3" + name="infohub_chk" + top_pad="3" + width="22" /> + <icon + follows="top|right" + height="16" + image_name="map_infohub.tga" + layout="topleft" + left_pad="0" mouse_opaque="true" - name="square" + name="infohub" top_delta="0" width="16" /> - <text + <text type="string" length="1" follows="top|right" + halign="left" height="16" + top_delta="2" + left_pad="3" layout="topleft" - left_pad="4" - name="land_for_sale_label" - top_delta="0" - width="145"> - Land For Sale + name="infohub_label" + width="90"> + Infohub </text> - <button + <check_box + control_name="MapShowLandForSale" follows="top|right" height="16" - label="Go Home" - label_selected="Go Home" layout="topleft" - left="-90" - name="Go Home" - tool_tip="Teleport to your home" - top="34" - width="88" > - <button.commit_callback - function="WMap.GoHome" /> - </button> + left="3" + name="land_for_sale_chk" + top_pad="2" + width="22" /> <icon - color="0 1 0 1" follows="top|right" - height="8" - image_name="map_avatar_8.tga" + height="16" + image_name="icon_for_sale.tga" layout="topleft" - left="-226" mouse_opaque="true" - name="person" - top="84" - width="8" /> - <check_box - control_name="MapShowPeople" + name="landforsale" + top_delta="0" + left_pad="0" + width="16" /> + <text + type="string" + length="1" follows="top|right" + halign="left" height="16" - label="Resident" + top_delta="2" + left_pad="3" layout="topleft" - left_pad="8" - name="people_chk" - top_delta="-4" - width="110" /> + name="land_sale_label" + width="90"> + Land Sale + </text> <icon + color="1 1 0.25 1" follows="top|right" height="16" - image_name="map_infohub.tga" + image_name="legend.tga" layout="topleft" - left="-230" mouse_opaque="true" - name="infohub" - top="100" + name="square2" + left="41" + top_pad="-2" width="16" /> - <check_box - control_name="MapShowInfohubs" + <text + type="string" + length="1" follows="top|right" height="16" - label="Infohub" layout="topleft" - left_pad="4" - name="infohub_chk" - top_delta="0" - width="110" /> - <icon + left_pad="0" + name="auction_label" + top_delta="3" + width="100"> + by owner + </text> + <icon + color="0.5 0.25 1 1" follows="top|right" height="16" - image_name="map_telehub.tga" + image_name="legend.tga" layout="topleft" - left="-230" mouse_opaque="true" - name="telehub" - top="120" + name="square2" + left="41" + top_pad="-3" width="16" /> - <check_box - control_name="MapShowTelehubs" + <text + type="string" + length="1" follows="top|right" height="16" - label="Telehub" layout="topleft" - left_pad="4" - name="telehub_chk" - top_delta="0" - width="110" /> - <icon + left_pad="0" + name="auction_label" + top_delta="3" + width="170"> + land auction + </text> + + <button follows="top|right" - height="16" - image_name="icon_for_sale.tga" + height="22" + image_overlay="map_home.tga" + scale_image="true" + label_color="White" layout="topleft" - left="-230" - mouse_opaque="true" - name="landforsale" - top="140" - width="16" /> - <check_box - control_name="MapShowLandForSale" + left="136" + top="6" + name="Go Home" + tool_tip="Teleport home" + width="24" > + <button.commit_callback + function="WMap.GoHome" /> + </button> + <text + type="string" + length="1" follows="top|right" - height="16" - label="Land for Sale" + halign="left" + height="13" + top_delta="6" + left_pad="5" layout="topleft" - left_pad="4" - name="land_for_sale_chk" - top_delta="0" - width="110" /> + name="Home_label" + width="70"> + Home + </text> <text type="string" length="1" follows="top|right" + halign="left" height="16" layout="topleft" - left="-104" + left="137" name="events_label" - top="80" - width="145"> + top_pad="9" + width="66"> Events: </text> - <icon + + <check_box + control_name="MapShowEvents" + follows="top|right" + height="16" + layout="topleft" + left="135" + top_pad="1" + name="event_chk" + width="22" /> + <icon follows="top|right" height="16" image_name="map_event.tga" layout="topleft" - left="-92" mouse_opaque="true" name="event" - top="100" + left_pad="0" width="16" /> + <text + type="string" + length="1" + follows="top|right" + halign="left" + height="16" + top_delta="2" + left_pad="3" + layout="topleft" + name="pg_label" + width="60"> + PG + </text> + <check_box - control_name="MapShowEvents" + control_name="ShowMatureEvents" follows="top|right" height="16" - label="General" + initial_value="true" layout="topleft" - left_pad="4" - name="event_chk" - top_delta="0" - width="55" /> + left="135" + name="event_mature_chk" + top_pad="3" + width="22" /> <icon follows="top|right" height="16" image_name="map_event_mature.tga" layout="topleft" - left="-92" mouse_opaque="true" name="events_mature_icon" - top="120" + top_delta="0" + left_pad="0" width="16" /> + <text + type="string" + length="1" + follows="top|right" + halign="left" + height="16" + top_delta="2" + left_pad="3" + layout="topleft" + name="mature_label" + width="66"> + Mature + </text> + <check_box - control_name="ShowMatureEvents" + control_name="ShowAdultEvents" follows="top|right" height="16" - initial_value="true" - label="Moderate" layout="topleft" - left_pad="4" - name="event_mature_chk" - top_delta="0" - width="55" /> + left="135" + name="event_adult_chk" + top_pad="3" + width="22" /> <icon follows="top|right" height="16" image_name="map_event_adult.tga" layout="topleft" - left="-92" + left_pad="0" mouse_opaque="true" name="events_adult_icon" - top="140" + top_delta="0" width="16" /> - <check_box - control_name="ShowAdultEvents" + <text + type="string" + length="1" follows="top|right" + halign="left" height="16" - label="Adult" + top_delta="2" + left_pad="3" layout="topleft" - left_pad="4" - name="event_adult_chk" - top_delta="0" - width="55" /> - <icon - color="0.5 0 0 1" + name="pg_label" + width="66"> + Adult + </text> +</panel> + + + <panel + follows="right|top" + height="22" + top_pad="0" + width="238" + background_visible="true" + bg_alpha_color="DkGray2"> + <text + text_color="White" + font="SansSerifLarge" + type="string" + length="1" follows="top|right" + halign="left" height="16" - image_name="map_track_16.tga" layout="topleft" - left="-230" - mouse_opaque="true" - name="avatar_icon" - top="164" - width="16" /> + left="15" + name="find_on_map_label" + top="3" + width="215"> + Find on Map + </text> + </panel> + + <panel + follows="right|top|bottom" + height="270" + top_pad="0" + width="238"> + <icon + color="0.5 0 0 1" + follows="top|right" + height="16" + image_name="map_track_16.tga" + layout="topleft" + left="5" + top="11" + mouse_opaque="true" + name="friends_icon" + width="16" /> <combo_box allow_text_entry="true" follows="top|right" - height="20" + height="23" label="Online Friends" layout="topleft" - left_pad="4" + top_delta="-4" + left_pad="5" max_chars="60" name="friend combo" - tool_tip="Friend to show on map" - top_delta="-4" - width="202"> + tool_tip="Show friends on map" + width="182"> <combo_box.item - label="Online Friends" + label="My Friends Online" name="item1" value="None" /> <combo_box.commit_callback function="WMap.AvatarCombo"/> </combo_box> - <icon + <icon color="0.5 0 0 1" follows="top|right" height="16" image_name="map_track_16.tga" layout="topleft" - left="-230" + left="5" + top_pad="8" mouse_opaque="true" name="landmark_icon" - top="189" width="16" /> <combo_box allow_text_entry="true" follows="top|right" - height="20" - label="Landmarks" + height="23" + label="My Landmarks" layout="topleft" - left_pad="4" + top_delta="-3" + left_pad="5" max_chars="64" name="landmark combo" tool_tip="Landmark to show on map" - top_delta="-4" - width="202"> + width="182"> <combo_box.item - label="Landmarks" + label="My Landmarks" name="item1" value="None" /> <combo_box.commit_callback function="WMap.Landmark"/> </combo_box> - <icon + <icon color="0.5 0 0 1" follows="top|right" height="16" image_name="map_track_16.tga" layout="topleft" - left="-230" + left="5" + top_pad="7" mouse_opaque="true" - name="location_icon" - top="214" + name="region_icon" width="16" /> - <line_editor + <search_editor follows="top|right" - height="20" - label="Search by Region Name" + search_button_visible="false" + height="22" + text_readonly_color="DkGray" + label="Regions by Name" layout="topleft" - left_pad="4" + top_delta="-2" + left_pad="5" name="location" select_on_focus="true" tool_tip="Type the name of a region" - top_delta="-4" - width="140" /> - <button + width="152" /> + <button follows="top|right" - height="20" - label="Search" + height="23" + label="Find" layout="topleft" - left_pad="5" + left_pad="2" + top_delta="-1" name="DoSearch" tool_tip="Search for region" - top_delta="0" - width="60"> + width="58"> <button.commit_callback function="WMap.Location" /> - </button> - <text - type="string" - length="1" - follows="top|right" - font="SansSerif" - height="16" - layout="topleft" - left="-230" - name="search_label" - top="234" - width="222"> - Search Results: - </text> + </button> <scroll_list draw_stripes="false" - follows="top|right|bottom" - height="200" + bg_writeable_color="MouseGray" + follows="all" + height="115" layout="topleft" - left_delta="0" + left="28" name="search_results" - top_pad="10" - width="222" + top_pad="5" + width="209" sort_column="1"> <scroll_list.columns label="" @@ -407,35 +512,87 @@ <scroll_list.columns label="" name="sim_name" - width="206" /> + width="193" /> <scroll_list.commit_callback function="WMap.SearchResult" /> </scroll_list> - <text + <button + follows="right|bottom" + height="23" + label="Teleport" + layout="topleft" + left="25" + name="Teleport" + tool_tip="Teleport to selected location" + top_pad="7" + width="104"> + <button.commit_callback + function="WMap.Teleport" /> + </button> + <button + follows="right|bottom" + height="23" + label="Copy SLurl" + layout="topleft" + left_pad="5" + name="copy_slurl" + tool_tip="Copies current location as SLurl to be used on the web." + top_delta="0" + width="104"> + <button.commit_callback + function="WMap.CopySLURL" /> + </button> + <!-- <button + follows="right|bottom" + height="23" + label="Clear" + layout="topleft" + left="10" + name="Clear" + tool_tip="Stop tracking" + top_pad="5" + width="105"> + <button.commit_callback + function="WMap.Clear" /> + </button>--> + <button + enabled="false" + follows="right|bottom" + height="23" + label="Show Selection" + left="25" + top_pad="5" + name="Show Destination" + tool_tip="Center map on selected location" + width="213"> + <button.commit_callback + function="WMap.ShowTarget" /> + </button> + +<!-- <text type="string" length="1" follows="bottom|right" - font="SansSerif" + halign="left" height="16" - layout="topleft" - left_delta="0" - name="location_label" top_pad="4" - width="98"> + left="25" + layout="topleft" + name="land_sale_label" + width="250"> Location: </text> - <spinner + <spinner decimal_digits="0" follows="bottom|right" - height="16" increment="1" initial_value="128" layout="topleft" - left_delta="70" + top_pad="0" + left="25" max_val="255" name="spin x" tool_tip="X coordinate of location to show on map" - top_delta="0" width="48"> <spinner.commit_callback function="WMap.CommitLocation" /> @@ -459,7 +616,6 @@ <spinner decimal_digits="0" follows="bottom|right" - height="16" increment="1" initial_value="0" layout="topleft" @@ -471,89 +627,58 @@ width="48"> <spinner.commit_callback function="WMap.CommitLocation" /> - </spinner> - <button - follows="right|bottom" - height="20" - label="Teleport" - label_selected="Teleport" - layout="topleft" - left="-230" - name="Teleport" - tool_tip="Teleport to selected location" - top="494" - width="90"> - <button.commit_callback - function="WMap.Teleport" /> - </button> - <button - follows="right|bottom" - height="20" - label="Show Destination" - label_selected="Show Destination" - layout="topleft" - left_pad="10" - name="Show Destination" - tool_tip="Center map on selected location" - top_delta="0" - width="125"> - <button.commit_callback - function="WMap.ShowTarget" /> - </button> - <button - follows="right|bottom" - height="20" - label="Clear" - label_selected="Clear" - layout="topleft" - left="-230" - name="Clear" - tool_tip="Stop tracking" - top="518" - width="90"> - <button.commit_callback - function="WMap.Clear" /> - </button> - <button - follows="right|bottom" - height="20" - label="Show My Location" - label_selected="Show My Location" + </spinner>--> + </panel> + <panel + follows="right|bottom" + height="22" + top_pad="0" + width="238" + background_visible="true" + bg_alpha_color="DkGray2"> + <text + text_color="White" + font="SansSerifLarge" + type="string" + length="1" + follows="top|right" + halign="left" + height="16" layout="topleft" - left_pad="10" - name="Show My Location" - tool_tip="Center map on your avatar's location" - top_delta="0" - width="125" > - <button.commit_callback - function="WMap.ShowAgent" /> - </button> - <button - enabled="false" - follows="bottom|right" - height="20" - label="Copy SLurl to clipboard" + left="15" + name="zoom_label" + top="3" + width="210"> + Zoom + </text> + </panel> + <panel + follows="right|bottom" + height="30" + min_height="30" + top_pad="0" + width="238"> + <icon + follows="left|bottom" + height="16" + image_name="Zoom_Off" layout="topleft" - left="-230" - name="copy_slurl" - tool_tip="Copies current location as SLurl to be used on the web." - top="542" - width="222"> - <button.commit_callback - function="WMap.CopySLURL" /> - </button> + left="20" + mouse_opaque="true" + name="zoom_icon" + top_pad="7" + width="16" /> <slider - follows="right|bottom" + follows="left|bottom" height="16" increment="0.2" - initial_value="48.5029" - label="Zoom" + initial_value="-2" + left_pad="0" layout="topleft" - left_delta="0" max_val="0" min_val="-8" name="zoom slider" show_text="false" - top_pad="8" - width="222" /> + width="200" /> + </panel> </floater> diff --git a/indra/newview/skins/default/xui/en/inspect_group.xml b/indra/newview/skins/default/xui/en/inspect_group.xml index 3929e3277a..37ae5a64d7 100644 --- a/indra/newview/skins/default/xui/en/inspect_group.xml +++ b/indra/newview/skins/default/xui/en/inspect_group.xml @@ -9,7 +9,7 @@ bg_opaque_image="Inspector_Background" can_close="false" can_minimize="false" - height="148" + height="158" layout="topleft" name="inspect_group" single_instance="true" @@ -49,6 +49,7 @@ height="45" left="8" name="group_details" + use_ellipses="true" top_pad="6" width="220" word_wrap="true"> @@ -60,7 +61,7 @@ Fear the moose! Fear it! And the mongoose too! height="13" left="8" name="group_cost" - top_pad="3" + top_pad="13" width="220"> L$123 to join </text> @@ -78,7 +79,7 @@ L$123 to join height="23" label="Join" left="8" - top="266" + top="286" name="join_btn" width="103" commit_callback.function="InspectGroup.Join"/> @@ -87,7 +88,7 @@ L$123 to join height="23" label="Leave" left="8" - top="266" + top="286" name="leave_btn" width="103" commit_callback.function="InspectGroup.Leave"/> @@ -96,7 +97,7 @@ L$123 to join height="23" label="View Profile" name="view_profile_btn" - top="266" + top="286" left="117" width="103" commit_callback.function="InspectGroup.ViewProfile" /> diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml index d99205b2fe..a11ebf5af8 100644 --- a/indra/newview/skins/default/xui/en/main_view.xml +++ b/indra/newview/skins/default/xui/en/main_view.xml @@ -10,22 +10,16 @@ <layout_stack border_size="0" follows="all" mouse_opaque="false" - height="768" + height="749" name="menu_stack" orientation="vertical" - top="0"> + top="19"> <layout_panel auto_resize="false" - height="84" + height="65" mouse_opaque="false" - name="nav_and_status_bar_region" + name="nav_bar_container" width="1024" visible="false"> - <panel follows="left|right|bottom" - left="0" - name="nav_bar_container" - right="1024" - top="19" - height="65"/> </layout_panel> <layout_panel auto_resize="true" follows="all" @@ -104,7 +98,7 @@ min_width="333" mouse_opaque="false" name="side_tray_container" - user_resize="true" + user_resize="false" visible="false" width="333"/> </layout_stack> diff --git a/indra/newview/skins/default/xui/en/menu_bottomtray.xml b/indra/newview/skins/default/xui/en/menu_bottomtray.xml index a7abb223ba..7ef91a1d85 100644 --- a/indra/newview/skins/default/xui/en/menu_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/menu_bottomtray.xml @@ -52,4 +52,57 @@ function="CheckControl" parameter="ShowSnapshotButton" /> </menu_item_check> + <menu_item_separator + name="Separator" /> + <menu_item_call + label="Cut" + name="NearbyChatBar_Cut"> + <menu_item_call.on_click + function="NearbyChatBar.Action" + parameter="cut" /> + <menu_item_call.on_enable + function="NearbyChatBar.EnableMenuItem" + parameter="can_cut" /> + </menu_item_call> + <menu_item_call + label="Copy" + name="NearbyChatBar_Copy"> + <menu_item_call.on_click + function="NearbyChatBar.Action" + parameter="copy" /> + <menu_item_call.on_enable + function="NearbyChatBar.EnableMenuItem" + parameter="can_copy" /> + </menu_item_call> + <menu_item_call + label="Paste" + name="NearbyChatBar_Paste"> + <menu_item_call.on_click + function="NearbyChatBar.Action" + parameter="paste" /> + <menu_item_call.on_enable + function="NearbyChatBar.EnableMenuItem" + parameter="can_paste" /> + </menu_item_call> + <menu_item_call + label="Delete" + name="NearbyChatBar_Delete"> + <menu_item_call.on_click + function="NearbyChatBar.Action" + parameter="delete" /> + <menu_item_call.on_enable + function="NearbyChatBar.EnableMenuItem" + parameter="can_delete" /> + </menu_item_call> + <menu_item_call + label="Select All" + name="NearbyChatBar_Select_All"> + <menu_item_call.on_click + function="NearbyChatBar.Action" + parameter="select_all" /> + <menu_item_call.on_enable + function="NearbyChatBar.EnableMenuItem" + parameter="can_select_all" /> + </menu_item_call> + </menu> diff --git a/indra/newview/skins/default/xui/en/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/en/menu_imchiclet_adhoc.xml new file mode 100644 index 0000000000..eb5e31b57d --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_imchiclet_adhoc.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu + height="101" + layout="topleft" + left="100" + mouse_opaque="false" + name="IMChiclet AdHoc Menu" + top="724" + visible="false" + width="128"> + <menu_item_call + label="End Session" + layout="topleft" + name="End Session"> + <menu_item_call.on_click + function="IMChicletMenu.Action" + parameter="end" /> + </menu_item_call> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml index 07940e18b6..a22dc80f4e 100644 --- a/indra/newview/skins/default/xui/en/menu_login.xml +++ b/indra/newview/skins/default/xui/en/menu_login.xml @@ -185,21 +185,42 @@ <menu_item_call.on_click function="Advanced.ShowSideTray" /> </menu_item_call> + <menu + label="UI Tests" + name="UI Tests" + tear_off="true"> + <menu_item_call + label="Textbox" + name="Textbox" + shortcut="control|1"> + <menu_item_call.on_click + function="ShowFloater" + parameter="test_textbox" /> + </menu_item_call> + <menu_item_call + label="Text Editor" + name="Text Editor" + shortcut="control|2"> + <menu_item_call.on_click + function="ShowFloater" + parameter="test_text_editor" /> + </menu_item_call> <menu_item_call - label="Widget Test" - name="Widget Test" + label="Widgets" + name="Widgets" shortcut="control|shift|T"> - <menu_item_call.on_click - function="ShowFloater" - parameter="test_widgets" /> + <menu_item_call.on_click + function="ShowFloater" + parameter="test_widgets" /> </menu_item_call> <menu_item_call - label="Inspectors Test" - name="Inspectors Test"> - <menu_item_call.on_click - function="ShowFloater" - parameter="test_inspectors" /> + label="Inspectors" + name="Inspectors"> + <menu_item_call.on_click + function="ShowFloater" + parameter="test_inspectors" /> </menu_item_call> + </menu> <menu_item_check label="Reg In Client Test (restart)" name="Reg In Client Test (restart)"> diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index f9a97ede67..d8eb65322b 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -4598,6 +4598,13 @@ Please select at least one type of content to search (General, Moderate, or Adul <notification icon="notify.tga" + name="PaymentRecived" + type="notify"> +[MESSAGE] + </notification> + + <notification + icon="notify.tga" name="EventNotification" type="notify"> Event Notification: 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 95d8b9cb1e..3e6ea84bf2 100644 --- a/indra/newview/skins/default/xui/en/panel_chat_header.xml +++ b/indra/newview/skins/default/xui/en/panel_chat_header.xml @@ -8,7 +8,7 @@ label="im_header" layout="topleft" name="im_header" - width="300"> + width="310"> <avatar_icon follows="left" height="18" diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml index 06c187991f..043edd10e1 100644 --- a/indra/newview/skins/default/xui/en/panel_group_general.xml +++ b/indra/newview/skins/default/xui/en/panel_group_general.xml @@ -1,14 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel follows="all" - height="378" + height="395" label="General" class="panel_group_general" layout="topleft" - left="0" - top="0" name="general_tab" - width="310"> + width="323"> <panel.string name="help_text"> The General tab contains general information about this group, a list of members, general Group Preferences and member options. @@ -32,7 +30,7 @@ Hover your mouse over the options for more help. max_length="511" name="charter" top="5" - width="305" + right="-1" word_wrap="true"> Group Charter </text_editor> @@ -41,12 +39,12 @@ Hover your mouse over the options for more help. draw_heading="true" follows="left|top" heading_height="20" - height="130" + height="156" layout="topleft" left="0" + right="-1" name="visible_members" - top_pad="2" - width="310"> + top_pad="2"> <name_list.columns label="Member" name="name" @@ -71,15 +69,15 @@ Hover your mouse over the options for more help. follows="left|top" height="20" layout="topleft" - left_delta="0" + left="5" + right="-5" name="active_title" tool_tip="Sets the title that appears in your avatar's name tag when this group is active." - top_pad="2" - width="300" /> + top_pad="2" /> <check_box height="16" font="SansSerifSmall" - label="Receive notices" + label="Receive group notices" layout="topleft" left="5" name="receive_notices" @@ -101,12 +99,12 @@ Hover your mouse over the options for more help. border="true" bg_alpha_color="FloaterUnfocusBorderColor" follows="left|top" - height="90" + height="88" layout="topleft" - left="5" + left="2" + right="-1" name="preferences_container" - top_pad="5" - width="300"> + top_pad="2"> <check_box follows="right|top" height="16" @@ -132,32 +130,23 @@ Hover your mouse over the options for more help. halign="left" height="16" increment="1" - label_width="20" + label_width="15" label="L$" layout="topleft" right="-10" max_val="99999" - left_pad="2" + left_pad="0" name="spin_enrollment_fee" tool_tip="New members must pay this fee to join the group when Enrollment Fee is checked." width="100" /> - <check_box - height="16" - initial_value="true" - label="Show in search" - layout="topleft" - left="10" - name="show_in_group_list" - tool_tip="Let people see this group in search results" - top_pad="4" - width="300" /> - <combo_box + <combo_box + follows="left|top" height="20" layout="topleft" - left_delta="0" + left="10" name="group_mature_check" tool_tip="Sets whether your group information is considered moderate" - top_pad="2" + top_pad="0" width="190"> <combo_box.item label="General Content" @@ -168,5 +157,16 @@ Hover your mouse over the options for more help. name="mature" value="Mature" /> </combo_box> + <check_box + follows="left|top" + height="16" + initial_value="true" + label="Show in search" + layout="topleft" + left="10" + name="show_in_group_list" + tool_tip="Let people see this group in search results" + top_pad="4" + width="300" /> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index a9a02e8fc7..0bc2b44ad5 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -6,7 +6,7 @@ left="0" name="panel_login" top="600" - width="800"> + width="996"> <panel.string name="create_account_url"> http://join.secondlife.com/ @@ -27,128 +27,133 @@ border_visible="false" bottom="600" follows="all" - hide_loading="true" + hide_loading="true" left="0" name="login_html" start_url="" top="0" height="600" - width="800"/> + width="996" /> <panel follows="left|bottom|right" name="login_widgets" layout="topleft" - left="0" - top="0"> + top="519" + width="996" + height="80"> <text follows="left|bottom" - font="SansSerif" + font="SansSerifSmall" height="16" - left="32" + left="20" name="first_name_text" - top="530" - width="120"> - First Name: + top="20" + width="150"> + Name: </text> <line_editor follows="left|bottom" - font="SansSerif" handle_edit_keys_directly="true" - height="20" + height="22" + label="First" left_delta="0" max_length="31" name="first_name_edit" select_on_focus="true" tool_tip="[SECOND_LIFE] First Name" - top_pad="2" - width="120" /> - <text - follows="left|bottom" - font="SansSerif" - height="16" - left="164" - name="last_name_text" - top="530" - width="120"> - Last Name: - </text> + top_pad="0" + width="135" /> <line_editor follows="left|bottom" - font="SansSerif" handle_edit_keys_directly="true" - height="20" - left_delta="0" + height="22" + label="Last" + left_pad="8" max_length="31" name="last_name_edit" select_on_focus="true" tool_tip="[SECOND_LIFE] Last Name" - top_pad="2" - width="120" /> - <text + top_delta="0" + width="135" /> + <combo_box + allow_text_entry="true" + font="SansSerifSmall" follows="left|bottom" - font="SansSerif" - height="16" - left="296" + height="23" + layout="topleft" + top="60" + name="server_combo" + width="135" + visible="false" /> + <text + follows="left|bottom" + font="SansSerifSmall" + height="15" + left_pad="8" name="password_text" - top="530" - width="120"> + top="20" + width="150"> Password: </text> <line_editor follows="left|bottom" - font="SansSerif" handle_edit_keys_directly="true" - height="20" - left_delta="0" + height="22" + left="304" max_length="16" name="password_edit" select_on_focus="true" - top_pad="2" - width="120" /> + top_pad="1" + width="135" /> + <check_box + control_name="RememberPassword" + follows="left|bottom" + font="SansSerifSmall" + height="16" + label="Remember" + left_pad="20" + top="20" + name="remember_check" + width="150" /> <button follows="left|bottom" height="23" + image_unselected="PushButton_On" + image_selected="PushButton_On_Selected" label="Log In" - label_selected="Log In" + label_color="White" layout="topleft" - left="425" + left="462" name="connect_btn" - top="546" - width="100" /> - <combo_box - allow_text_entry="true" - follows="left|bottom" - height="23" - layout="topleft" - left_pad="5" - name="server_combo" - width="100" /> - <text - follows="left|bottom" - font="SansSerif" - height="16" - left="32" + top="35" + width="90" /> + <text + follows="right|bottom" + font="SansSerifSmall" + height="15" + halign="right" + left_pad="10" + right="-240" name="start_location_text" - top="576" - width="95"> - Start location: + top="20" + width="130"> + Starting location: </text> <combo_box allow_text_entry="true" control_name="LoginLocation" - follows="left|bottom" + follows="right|bottom" height="23" - left_pad="0" max_chars="128" + top_pad="0" name="start_location_combo" - top_delta="-2" - width="155"> + width="135"> <combo_box.item - label="My Last Location" + label="My last location" name="MyLastLocation" value="last" /> <combo_box.item - label="My Home" + label="My home" name="MyHome" value="home" /> <combo_box.item @@ -156,43 +161,39 @@ name="Typeregionname" value="" /> </combo_box> - <check_box - control_name="RememberPassword" - follows="left|bottom" - height="16" - label="Remember password" - left_pad="10" - name="remember_check" - top_delta="3" - width="138" /> <text follows="right|bottom" + font="SansSerifSmall" + text_color="EmphasisColor" halign="right" height="16" - left="-210" + top="17" + left_pad="10" + right="-10" name="create_new_account_text" - top="539" - width="200"> - Create a new account + width="180"> + Sign up for account </text> <text follows="right|bottom" + font="SansSerifSmall" + text_color="EmphasisColor" halign="right" height="16" - left_delta="0" name="forgot_password_text" - top_pad="4" - width="200"> + top_pad="2" + width="180"> Forgot your name or password? </text> <text follows="right|bottom" + font="SansSerifSmall" halign="right" - height="16" - left="-310" + height="28" + top_pad="2" name="channel_text" - top="579" - width="300"> + width="180" + word_wrap="true"> [VERSION] </text> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml index 4f0d155876..4c2bd67337 100644 --- a/indra/newview/skins/default/xui/en/panel_picks.xml +++ b/indra/newview/skins/default/xui/en/panel_picks.xml @@ -162,16 +162,5 @@ tab_stop="false" top="0" width="50" /> - <button - enabled="false" - follows="bottom|right" - height="25" - label="▼" - layout="topleft" - name="overflow_btn" - right="-10" - tab_stop="false" - top="0" - width="30" /> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml index fac0d5c60f..3aa5d3fae4 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml @@ -318,4 +318,37 @@ name="plain_text_chat_history" top_pad="5" width="400" /> + <text + left="30" + height="20" + width="300" + top_pad="20"> + Show IMs in: + </text> + <radio_group + height="30" + layout="topleft" + left="30" + control_name="ChatWindow" + name="chat_window" + top_pad="10" + tool_tip="Show chat in multiple windows(by default) or in one multi-tabbed window (requires restart)" + width="331"> + <radio_item + height="16" + label="Multiple windows" + layout="topleft" + left="0" + name="radio" + top="0" + width="150" /> + <radio_item + height="16" + label="One window" + layout="topleft" + left_delta="145" + name="radio2" + top_delta="0" + width="150" /> + </radio_group> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml index 95242a9639..63b7112c17 100644 --- a/indra/newview/skins/default/xui/en/panel_side_tray.xml +++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml @@ -23,6 +23,7 @@ background_visible="true" > <panel + class="panel_sidetray_home" name="panel_home" filename="panel_sidetray_home_tab.xml" label="home" diff --git a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml index 9839075862..4b841b0a09 100644 --- a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml +++ b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml @@ -1,265 +1,92 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<!-- Part of side tray, see that XML file for panel config --> +<!-- the web-based Home panel of the side tray --> <panel follows="all" - height="560" + height="570" + min_height="350" label="home_tab" + help_topic="sidetray_home" layout="topleft" + top="0" + left="0" name="home_tab" width="333"> - <scroll_container - color="DkGray" + <layout_stack follows="all" + height="550" layout="topleft" - left="0" - name="profile_scroll" - opaque="true" - height="560" - width="333" - top="0"> - <panel - background_visible="true" - height="560" - layout="topleft" - name="profile_scroll_panel" - top="0" - left="0" - width="311"> - <panel - background_visible="true" - bg_alpha_color="DkGray2" - class="panel_sidetray_home_info" - follows="left|top|right" - height="90" - layout="topleft" - left="15" - top="17" - name="sidebar_people" - width="303"> - <text - follows="left|right|top" - font="SansSerifBigBold" - height="30" - layout="topleft" - left="10" - mouse_opaque="false" - name="tab_name" - text_color="EmphasisColor" - top="10" - value="People" - width="200" - word_wrap="true" /> - <icon - follows="top|right" - height="20" - layout="topleft" - name="tab_icon" - right="-10" - top="10" - image_name="TabIcon_People_Selected" - width="20" /> - <text - follows="left|right|bottom" - height="90" - layout="topleft" - left="10" - mouse_opaque="false" - name="tab_description" - right="-10" - text_color="white" - top="40" - word_wrap="true"> - Find your friends, your groups, contacts and people nearby. - </text> - </panel> - <panel - background_visible="true" - bg_alpha_color="DkGray2" - class="panel_sidetray_home_info" - follows="left|top|right" - height="90" - layout="topleft" - left="15" - top_pad="15" - name="sidebar_places" - width="303"> - <text - follows="left|right|top" - font="SansSerifBigBold" - height="30" - layout="topleft" - left="10" - mouse_opaque="false" - name="tab_name" - text_color="EmphasisColor" - top="10" - value="Places" - width="200" - word_wrap="true" /> - <icon - follows="top|right" - height="20" - layout="topleft" - name="tab_icon" - right="-10" - top="10" - width="20" - image_name="TabIcon_Places_Selected"/> - <text - follows="all" - height="90" - layout="topleft" - left="10" - mouse_opaque="false" - name="tab_description" - right="-10" - text_color="white" - top="40" - word_wrap="true"> - Find places to go and places you've visited before. - </text> - </panel> - <panel - background_visible="true" - bg_alpha_color="DkGray2" - class="panel_sidetray_home_info" - follows="left|top|right" - height="90" - layout="topleft" - left="15" - top_pad="15" - name="sidebar_me" - width="303"> - <text - follows="left|right|top" - font="SansSerifBigBold" - height="30" - layout="topleft" - left="10" - mouse_opaque="false" - name="tab_name" - text_color="EmphasisColor" - top="10" - value="My Profile" - width="200" - word_wrap="true" /> - <icon - follows="top|right" - height="20" - layout="topleft" - name="tab_icon" - right="-10" - top="10" - width="20" - image_name="TabIcon_Me_Selected"/> - <text - follows="all" - height="90" - layout="topleft" - left="10" - mouse_opaque="false" - name="tab_description" - right="-10" - text_color="white" - top="40" - word_wrap="true"> - Edit your public profile. - </text> - </panel> - <panel - background_visible="true" - bg_alpha_color="DkGray2" - class="panel_sidetray_home_info" - follows="left|top|right" - height="90" + left="10" + name="stack" + top_pad="10" + width="313"> + <layout_panel + auto_resize="false" + height="20" layout="topleft" - left="15" - top_pad="15" - name="sidebar_appearance" - width="303"> - <text - follows="left|right|top" - font="SansSerifBigBold" - height="30" - layout="topleft" - left="10" - mouse_opaque="false" - name="tab_name" - text_color="EmphasisColor" - top="10" - value="My Appearance" - width="200" - word_wrap="true" /> - <icon - follows="top|right" - height="20" - layout="topleft" - name="tab_icon" - right="-10" - top="10" - width="20" - image_name="TabIcon_Appearance_Selected"/> - <text - follows="all" - height="90" - layout="topleft" - left="10" - mouse_opaque="false" - name="tab_description" - right="-10" - text_color="white" - top="40" - word_wrap="true"> - Change your appearance and current look. - </text> - </panel> - <panel - background_visible="true" - bg_alpha_color="DkGray2" - class="panel_sidetray_home_info" - follows="left|top|right" - height="90" + left="0" + name="nav_controls" + top="0" + user_resize="false" + width="313"> + <button + follows="left|top" + enabled="false" + height="20" + label="Back" + layout="topleft" + tab_stop="false" + left="0" + name="back" + top="0" + width="70"> + <button.commit_callback + function="MediaBrowser.Back" /> + </button> + <button + follows="left|top" + height="20" + enabled="false" + label="Forward" + layout="topleft" + tab_stop="false" + left_pad="3" + name="forward" + top_delta="0" + width="70"> + <button.commit_callback + function="MediaBrowser.Forward" /> + </button> + <button + follows="left|top" + height="20" + label="Home" + layout="topleft" + tab_stop="false" + left_pad="2" + name="home" + top_delta="0" + width="70"> + <button.commit_callback + function="MediaBrowser.Home" /> + </button> + </layout_panel> + <layout_panel + height="530" layout="topleft" - left="15" - top_pad="15" - name="sidebar_inventory" - width="303"> - <text - follows="left|right|top" - font="SansSerifBigBold" - height="30" - layout="topleft" - left="10" - mouse_opaque="false" - name="tab_name" - text_color="EmphasisColor" - top="10" - value="My Inventory" - width="200" - word_wrap="true" /> - <icon - follows="top|right" - height="20" - layout="topleft" - name="tab_icon" - right="-10" - top="10" - width="20" - image_name="TabIcon_Things_Selected"/> - <text - follows="all" - height="90" - layout="topleft" - left="10" - mouse_opaque="false" - name="tab_description" - right="-10" - text_color="white" - top="40" - word_wrap="true"> - Browse your inventory. - </text> - </panel> - </panel> - </scroll_container> + left_delta="0" + name="browser_layout" + top_delta="0" + width="313"> + <web_browser + border_visible="false" + follows="all" + height="530" + layout="topleft" + left="0" + name="browser" + start_url="data:text/html,%3Chtml%3E%3Cbody bgcolor=%22#2A2A2A%22 text=%22eeeeee%22%3E %3Ch3%3E %0D%0A%0D%0ALoading... %3C/h3%3E %3C/body%3E%3C/html%3E" + top="0" + width="313" /> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index e795c8e241..b014b8d1c0 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2777,11 +2777,19 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Wild">Wild</string> <string name="Wrinkles">Wrinkles</string> - <!-- Favorites Bar --> + <!-- Navigation bar location input control. + Strings are here because widget xml is not localizable --> <string name="LocationCtrlAddLandmarkTooltip">Add to My Landmarks</string> <string name="LocationCtrlEditLandmarkTooltip">Edit My Landmark</string> <string name="LocationCtrlInfoBtnTooltip">See more info about the current location</string> <string name="LocationCtrlComboBtnTooltip">My location history</string> + <string name="LocationCtrlForSaleTooltip">Buy this land</string> + <string name="LocationCtrlVoiceTooltip">Voice not available here</string> + <string name="LocationCtrlFlyTooltip">Flying not allowed</string> + <string name="LocationCtrlPushTooltip">No pushing</string> + <string name="LocationCtrlBuildTooltip">Building/dropping objects not allowed</string> + <string name="LocationCtrlScriptsTooltip">Scripts not allowed</string> + <string name="LocationCtrlDamageTooltip">Health</string> <!-- Strings used by the (currently Linux) auto-updater app --> <string name="UpdaterWindowTitle"> diff --git a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml index c0e1944f56..9990324d03 100644 --- a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml +++ b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml @@ -9,5 +9,6 @@ header_image_over="Accordion_Over" header_image_pressed="Accordion_Press" header_image_expanded="Accordion_Selected" - header_text_color="LtGray" + header_text_color="LtGray" + font="SansSerif" /> diff --git a/indra/newview/skins/default/xui/en/widgets/chat_history.xml b/indra/newview/skins/default/xui/en/widgets/chat_history.xml index 32916c0816..2be37d222a 100644 --- a/indra/newview/skins/default/xui/en/widgets/chat_history.xml +++ b/indra/newview/skins/default/xui/en/widgets/chat_history.xml @@ -15,4 +15,5 @@ track_bottom="true" name="chat_history" type="string" - word_wrap="true" />
\ No newline at end of file + word_wrap="true" + font="SansSerif"/> diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml index 5011bf6a61..e5af961a56 100644 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<chiclet_script
- name="script_chiclet">
+ name="script_chiclet"
+ font="SansSerif">
<icon
name="chiclet_icon"
follows="all"
diff --git a/indra/newview/skins/default/xui/en/widgets/floater.xml b/indra/newview/skins/default/xui/en/widgets/floater.xml index 1425258b2a..b2bd9c38c9 100644 --- a/indra/newview/skins/default/xui/en/widgets/floater.xml +++ b/indra/newview/skins/default/xui/en/widgets/floater.xml @@ -9,6 +9,8 @@ background_visible="true" background_opaque="false" header_height="25" + top="0" + left="0" close_image="Icon_Close_Foreground" restore_image="Icon_Restore_Foreground" minimize_image="Icon_Minimize_Foreground" diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml index d32952b04f..0e2700cb80 100644 --- a/indra/newview/skins/default/xui/en/widgets/location_input.xml +++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml @@ -20,6 +20,8 @@ follows="left|top" allow_new_values="true" > + <!-- *NOTE: Tooltips are in strings.xml so they can be localized. + See LocationCtrlAddLandmarkTooltip etc. --> <info_button name="Place Information" width="16" height="16" @@ -50,6 +52,7 @@ top="21" /> <voice_icon + enabled="true" name="voice_icon" width="22" height="18" diff --git a/indra/newview/skins/default/xui/en/widgets/menu_item.xml b/indra/newview/skins/default/xui/en/widgets/menu_item.xml index 2bbaa6233f..c65244ae22 100644 --- a/indra/newview/skins/default/xui/en/widgets/menu_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/menu_item.xml @@ -1,4 +1,3 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <!-- Use this for the top-level menu styling --> -<menu_item> -</menu_item> +<menu_item font="SansSerif" /> diff --git a/indra/newview/skins/default/xui/en/widgets/radio_item.xml b/indra/newview/skins/default/xui/en/widgets/radio_item.xml index dd848f3acd..3ddf18b2cb 100644 --- a/indra/newview/skins/default/xui/en/widgets/radio_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/radio_item.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<radio_item follows="left|top"> +<radio_item follows="left|top" font="SansSerif"> <radio_item.label_text name="Radio Item label"/> <radio_item.check_button name="Radio control button" image_unselected="RadioButton_Off" diff --git a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml index 706c89f5ed..89d5950e98 100644 --- a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml +++ b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml @@ -8,4 +8,5 @@ track_image_horizontal="SliderTrack_Horiz" track_image_vertical="SliderTrack_Vert" track_highlight_horizontal_image="SliderTrack_Horiz" - track_highlight_vertical_image="SliderTrack_Vert" /> + track_highlight_vertical_image="SliderTrack_Vert" + font="SansSerif" /> diff --git a/indra/newview/skins/default/xui/en/widgets/spinner.xml b/indra/newview/skins/default/xui/en/widgets/spinner.xml index 7d1a5118cb..ab3f8df5f8 100644 --- a/indra/newview/skins/default/xui/en/widgets/spinner.xml +++ b/indra/newview/skins/default/xui/en/widgets/spinner.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <spinner text_enabled_color="LabelTextColor" text_disabled_color="LabelDisabledColor" + font="SansSerif" decimal_digits="3" label_width="40" > <spinner.up_button name="SpinCtrl Up" diff --git a/indra/newview/skins/default/xui/en/widgets/textbase.xml b/indra/newview/skins/default/xui/en/widgets/textbase.xml index 166e8555fe..f4dc192bc3 100644 --- a/indra/newview/skins/default/xui/en/widgets/textbase.xml +++ b/indra/newview/skins/default/xui/en/widgets/textbase.xml @@ -1,2 +1,3 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<textbase clip_partial="false"/> +<textbase clip_partial="false" + font="SansSerif"/> diff --git a/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml b/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml index 2f72ad65a1..f4dbb8f404 100644 --- a/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml +++ b/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <!-- Global settings for all widgets ("UI Controls") --> +<!-- The params in this file aren't currently getting loaded in OSX --> <ui_ctrl - font="SansSerif" /> |