diff options
Diffstat (limited to 'indra/newview/skins/default/xui')
23 files changed, 694 insertions, 1835 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml index 88aca005cf..26d2f4e497 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -3,7 +3,7 @@ legacy_header_height="18" background_visible="true" follows="left|top|right|bottom" - height="359" + height="270" layout="topleft" left="0" name="panel_im" @@ -12,13 +12,13 @@ can_dock="true" can_minimize="true" visible="true" - width="400" + width="365" can_resize="true" min_width="200" min_height="150"> <layout_stack follows="left|top|right|bottom" - height="344" - width="400" + height="255" + width="365" layout="topleft" orientation="horizontal" name="im_panels" @@ -28,13 +28,13 @@ name="panel_im_control_panel" layout="topleft" top_delta="-3" - height="344" + width="146" + height="255" follows="left" label="IM Control Panel" - auto_resize="false" user_resize="false" /> - <layout_panel height="344" - width="235" + <layout_panel height="255" + width="200" left_delta="146" top="0" user_resize="false"> @@ -56,14 +56,14 @@ length="1" follows="left|top|right|bottom" font="SansSerif" - height="290" + height="205" layout="topleft" name="chat_history" parse_highlights="true" allow_html="true" - width="230"> + width="195"> </chat_history> - <line_editor follows="left|right" name="chat_editor" height="20" layout="topleft" width="225"> + <line_editor follows="left|right" name="chat_editor" height="20" layout="topleft" width="190"> </line_editor> </layout_panel> </layout_stack> diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml index e2ae81e0b9..6b13e2f1c7 100644 --- a/indra/newview/skins/default/xui/en/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml @@ -128,8 +128,6 @@ left_delta="110" tab_stop="false" width="18" /> - <!-- Overlapping buttons for default actions - llinspectavatar.cpp makes visible the most likely default action --> <button follows="bottom|left" height="23" @@ -138,16 +136,6 @@ top="246" name="add_friend_btn" width="100" /> - <button - follows="bottom|left" - height="23" - label="IM" - left_delta="0" - top_delta="0" - name="im_btn" - width="100" - commit_callback.function="InspectAvatar.IM" - /> <menu_button follows="top|left" height="18" diff --git a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml index 8ee67b9a02..6049476a43 100644 --- a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml @@ -7,6 +7,7 @@ name="Gear Menu">
<menu_item_call
label="View Profile"
+ layout="topleft"
enabled="true"
name="view_profile">
<menu_item_call.on_click
@@ -14,42 +15,49 @@ </menu_item_call>
<menu_item_call
label="Add Friend"
+ layout="topleft"
name="add_friend">
<menu_item_call.on_click
function="InspectAvatar.AddFriend"/>
</menu_item_call>
<menu_item_call
label="IM"
+ layout="topleft"
name="im">
<menu_item_call.on_click
function="InspectAvatar.IM"/>
</menu_item_call>
<menu_item_call
label="Call"
+ layout="topleft"
enabled="true"
name="call">
</menu_item_call>
<menu_item_call
label="Teleport"
+ layout="topleft"
name="teleport">
<menu_item_call.on_click
function="InspectAvatar.Teleport"/>
</menu_item_call>
<menu_item_call
label="Invite to Group"
+ layout="topleft"
name="invite_to_group">
<menu_item_call.on_click
function="InspectAvatar.InviteToGroup"/>
</menu_item_call>
- <menu_item_separator />
+ <menu_item_separator layout="topleft" />
<menu_item_call
label="Block"
+ layout="topleft"
name="block">
<menu_item_call.on_click
function="InspectAvatar.Block"/>
</menu_item_call>
<menu_item_call
label="Report"
+ layout="topleft"
name="report">
<menu_item_call.on_click
function="InspectAvatar.Report"/>
@@ -80,6 +88,7 @@ </menu_item_call>
<menu_item_call
label="Find On Map"
+ layout="topleft"
name="find_on_map">
<menu_item_call.on_click
function="InspectAvatar.FindOnMap"/>
@@ -88,14 +97,16 @@ </menu_item_call>
<menu_item_call
label="Zoom In"
+ layout="topleft"
name="zoom_in">
<menu_item_call.on_click
function="InspectAvatar.ZoomIn"/>
</menu_item_call>
<menu_item_call
label="Pay"
+ layout="topleft"
name="pay">
<menu_item_call.on_click
function="InspectAvatar.Pay"/>
</menu_item_call>
-</menu>
+</menu>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml index ce5ee83f55..19c2bf3496 100644 --- a/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml @@ -7,6 +7,7 @@ name="Gear Menu"> <menu_item_call label="Stand Up" + layout="topleft" enabled="true" name="stand_up"> <menu_item_call.on_click @@ -17,6 +18,7 @@ </menu_item_call> <menu_item_call label="My Appearance" + layout="topleft" name="my_appearance"> <menu_item_call.on_click function="ShowFloater" @@ -26,6 +28,7 @@ </menu_item_call> <menu_item_call label="My Profile" + layout="topleft" enabled="true" name="my_profile"> <menu_item_call.on_click @@ -34,6 +37,7 @@ </menu_item_call> <menu_item_call label="My Friends" + layout="topleft" name="my_friends"> <menu_item_call.on_click function="Self.Friends" @@ -41,8 +45,9 @@ </menu_item_call> <menu_item_call label="My Groups" + layout="topleft" name="my_groups"> <menu_item_call.on_click function="Self.Groups" /> </menu_item_call> -</menu> +</menu>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml index 87c4e2787f..f50acc224f 100644 --- a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml +++ b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel name="panel_im_control_panel" - width="180" + width="146" height="215" border="false"> <avatar_list @@ -16,11 +16,10 @@ show_info_btn="false" show_profile_btn="false" top="10" - width="180" /> + width="140" /> <button name="call_btn" label="Call" - left_delta="27" width="125" height="20" /> <button diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index b5051523e5..61bd1d186e 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -60,7 +60,7 @@ min_width="96" name="speak_panel" user_resize="false"> - <talk_button + <chiclet_talk follows="right" height="23" speak_button.tab_stop="true" @@ -93,7 +93,7 @@ min_width="76" name="gesture_panel" user_resize="false"> - <gesture_combo_box + <button follows="right" height="23" label="Gesture" diff --git a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml index 3358015335..9ed510dff3 100644 --- a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml +++ b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel name="panel_im_control_panel" - width="180" + width="146" height="238" border="false"> <avatar_list @@ -16,11 +16,11 @@ show_info_btn="false" show_profile_btn="false" top="10" - width="180" /> + width="140" /> <button name="group_info_btn" label="Group Info" - left_delta="27" + left_delta="3" width="125" height="20" /> <button 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 4f24c7a745..a85c55f9b2 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,14 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel follows="all" - height="380" + height="412" label="General" class="panel_group_general" layout="topleft" left="0" top="0" name="general_tab" - width="303"> + width="313"> <panel.string name="help_text"> The General tab contains general information about this group, a list of members, general Group Preferences and member options. @@ -41,7 +41,7 @@ Hover your mouse over the options for more help. draw_heading="true" follows="left|top" heading_height="16" - height="130" + height="160" layout="topleft" left_delta="0" name="visible_members" diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml index ab0f956da0..d8d47c4008 100644 --- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml @@ -5,7 +5,7 @@ background_visible="true" height="570" label="Group Info" layout="topleft" - min_height="425" + min_height="350" left="0" top="20" name="GroupInfo" @@ -47,7 +47,7 @@ background_visible="true" text_color="white" top="0" value="(Loading...)" - use_ellipses="true" + use_elipsis="true" width="300" /> <line_editor follows="left|top" @@ -60,7 +60,7 @@ background_visible="true" top_delta="5" width="250" height="20" - visible="false" /> + visible="true" /> <texture_picker follows="left|top" height="113" @@ -112,46 +112,33 @@ background_visible="true" left_delta="0" top_pad="6" height="23" - label="JOIN NOW!" + label="Join now!" + label_selected="Join now!" name="btn_join" visible="true" width="120" /> <accordion follows="all" - height="425" + height="405" layout="topleft" left="0" - multiple_expansion="false" name="groups_accordion" - top_pad="15" - width="336"> + top_pad="20" + width="333"> <accordion_tab can_resize="false" - expanded="true" layout="topleft" name="tab_general" title="General"> - <scroll_container - color="DkGray2" - opaque="true" - height="323" - follows="all" + <panel + border="false" + filename="panel_group_general.xml" layout="topleft" left="0" + help_topic="group_general_tab" + name="general_tab" top="0" - name="general_scroll" - reserve_scroll_corner="false" - width="333"> - <panel - border="false" - filename="panel_group_general.xml" - layout="topleft" - left="0" - help_topic="group_general_tab" - name="general_tab" - top="0" - width="303" /> - </scroll_container> + width="333" /> </accordion_tab> <accordion_tab can_resize="false" @@ -159,27 +146,15 @@ background_visible="true" layout="topleft" name="tab_roles" title="Roles"> - <scroll_container - color="DkGray2" - opaque="true" - height="323" - follows="all" - layout="topleft" - left="0" - top="0" - name="roles_scroll" - reserve_scroll_corner="false" - width="333"> - <panel - border="false" - filename="panel_group_roles.xml" - layout="topleft" - left="0" - help_topic="group_roles_tab" - name="roles_tab" - top="0" - width="303" /> - </scroll_container> + <panel + border="false" + filename="panel_group_roles.xml" + layout="topleft" + left="0" + help_topic="group_roles_tab" + name="roles_tab" + top="0" + width="333" /> </accordion_tab> <accordion_tab can_resize="false" @@ -187,45 +162,21 @@ background_visible="true" layout="topleft" name="tab_notices" title="Notices"> - <scroll_container - color="DkGray2" - opaque="true" - height="323" - follows="all" - layout="topleft" - left="0" - top="0" - name="notices_scroll" - reserve_scroll_corner="false" - width="333"> <panel - border="false" filename="panel_group_notices.xml" layout="topleft" left="0" help_topic="group_notices_tab" name="notices_tab" top="0" - width="303" /> - </scroll_container> + width="333" /> </accordion_tab> - <accordion_tab + <accordion_tab can_resize="false" expanded="false" layout="topleft" name="tab_notices" title="Land/Assets"> - <scroll_container - color="DkGray2" - opaque="true" - height="323" - follows="all" - layout="topleft" - left="0" - top="0" - name="land_scroll" - reserve_scroll_corner="false" - width="333"> <panel border="false" filename="panel_group_land_money.xml" @@ -234,43 +185,41 @@ background_visible="true" help_topic="group_land_money_tab" name="land_money_tab" top="0" - width="313" /> - </scroll_container> + width="333" /> </accordion_tab> </accordion> - <button + <button follows="top|left" - height="22" + height="20" image_overlay="Refresh_Off" layout="topleft" - left="5" name="btn_refresh" picture_style="true" - top_pad="-15" - width="23" /> - <button + left="5" + width="20" /> + <button + height="20" + font="SansSerifSmall" + label="Save" + label_selected="Save" + name="btn_apply" + left_pad="5" + width="65" /> + <button height="20" label="Create" - label_selected="New group" + label_selected="Create" name="btn_create" - left_pad="10" + left_pad="5" visible="false" - width="100" /> - <!-- <button - left_pad="10" + width="65" /> + <button + left_pad="5" height="20" label="Cancel" label_selected="Cancel" name="btn_cancel" visible="false" - width="65" />--> - <button - height="20" - font="SansSerifSmall" - label="Save" - label_selected="Save" - name="btn_apply" - left_pad="10" - right="-10" width="65" /> + </panel>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml index 99fc39c466..c81c7113ae 100644 --- a/indra/newview/skins/default/xui/en/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/en/panel_group_land_money.xml @@ -1,25 +1,25 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - border="false" + border="true" follows="all" height="510" label="Land & L$" layout="topleft" left="1" name="land_money_tab" - top="0" - width="313"> + top="490" + width="280"> <panel.string name="help_text"> - Parcels owned by a group are listed along with contribution details. A warning appears until the Total Land in Use is less than or = to the Total Contribution. + Parcels owned by the group are listed along with contribution details. A warning appears until the Total Land in Use is less than or equal to the Total Contribution. The Planning, Details, and Sales tabs provide information about the group's finances. </panel.string> <panel.string name="cant_view_group_land_text"> - You don't have permission to view group owned land + You do not have permission to view group owned land. </panel.string> <panel.string name="cant_view_group_accounting_text"> - You don't have permission to view the group's accounting information. + You do not have permission to view the group's accounting information. </panel.string> <panel.string name="loading_txt"> @@ -27,7 +27,7 @@ </panel.string> <panel.string name="land_contrib_error"> - Unable to set your land contribution + Unable to set your land contribution. </panel.string> <!-- <text type="string" @@ -44,29 +44,29 @@ <scroll_list draw_heading="true" follows="top" - heading_height="20" - height="150" + heading_height="14" + height="100" layout="topleft" - left="0" + left="5" name="group_parcel_list" - top_pad="0" - width="313"> + top_pad="10" + width="265"> <scroll_list.columns label="Parcel" name="name" - width="78" /> + width="67" /> <scroll_list.columns label="Region" name="location" - width="78" /> + width="72" /> <scroll_list.columns label="Type" name="type" - width="70" /> + width="60" /> <scroll_list.columns label="Area" name="area" - width="50" /> + width="20" /> <scroll_list.columns label="" name="hidden" @@ -74,14 +74,14 @@ </scroll_list> <button follows="top" - height="23" + height="20" label="Map" label_selected="Map" layout="topleft" + left="150" name="map_button" - right="-10" - top_pad="5" - width="95" + top_pad="10" + width="125" enabled="false" /> <text type="string" @@ -91,12 +91,11 @@ layout="topleft" left="5" name="total_contributed_land_label" - top_pad="0" + top_pad="10" width="130"> Total Contribution: </text> <text - text_color="EmphasisColor" type="string" follows="left|top" height="16" @@ -120,7 +119,6 @@ Total Land In Use: </text> <text - text_color="EmphasisColor" type="string" follows="left|top" height="16" @@ -144,7 +142,6 @@ Land Available: </text> <text - text_color="EmphasisColor" type="string" follows="left|top" height="16" @@ -171,19 +168,19 @@ border_style="line" border_thickness="1" follows="left|top" - height="19" + height="16" layout="topleft" left_pad="5" max_length="10" name="your_contribution_line_editor" - top_delta="0" + top_delta="-2" width="95" /> <text type="string" follows="left|top" height="16" layout="topleft" - left_pad="3" + left_pad="5" name="your_contribution_units" top_delta="2"> m² @@ -196,13 +193,13 @@ layout="topleft" left="140" name="your_contribution_max_value" - top_pad="2" + top_pad="0" width="95"> ([AMOUNT] max) </text> <icon height="16" - image_name="notify_next" + image_name="smicon_warn.tga" layout="topleft" left="9" name="group_over_limit_icon" @@ -214,14 +211,14 @@ type="string" word_wrap="true" font="SansSerifSmall" - height="35" + height="40" layout="topleft" - left_pad="0" + left_pad="5" name="group_over_limit_text" - text_color="EmphasisColor" + text_color="GroupOverTierColor" top_delta="0" - width="290"> - Group members must contribute more land credits to support land in use + width="250"> + Group members must contribute more land credits to support land in use. </text> <text type="string" @@ -245,126 +242,128 @@ name="group_money_tab_container" tab_position="top" tab_height="20" - top_pad="2" - tab_min_width="70" - width="300"> + top_pad="10" + width="265"> <panel - border="false" + border="true" follows="all" height="180" - label="PLANNING" + label="Planning" layout="topleft" - left="0" + left="1" help_topic="group_money_planning_tab" name="group_money_planning_tab" top="5" - width="300"> + width="265"> <text_editor type="string" + bg_readonly_color="0.784314 0.819608 0.8 1" follows="all" - font="SansSerif" - height="140" + font="Monospace" + height="168" layout="topleft" - left="0" + left="8" max_length="4096" name="group_money_planning_text" - top="0" - width="300" + top="5" + width="250" word_wrap="true"> - Loading... + Computing... </text_editor> </panel> <panel - border="false" - follows="all" + border="true" + follows="left|top|right|bottom" height="180" - label="DETAILS" + label="Details" layout="topleft" - left="0" + left_delta="0" help_topic="group_money_details_tab" name="group_money_details_tab" - top="5" - width="300"> + top_delta="0" + width="265"> <text_editor type="string" + bg_readonly_color="0.784314 0.819608 0.8 1" follows="all" + font="Monospace" height="140" layout="topleft" - left="0" + left="8" max_length="4096" name="group_money_details_text" - top="0" - width="300" + top="7" + width="250" word_wrap="true"> - Loading... + Computing... </text_editor> + <button + height="20" + label="< Earlier" + label_selected="< Earlier" + layout="topleft" + left="5" + name="earlier_details_button" + tool_tip="Go back in time" + top_pad="10" + width="125" /> <button - follows="left|top" - height="23" - image_overlay="Arrow_Left_Off" - layout="topleft" - name="earlier_details_button" - picture_style="true" - tool_tip="Back" - top_pad="3" - right="-35" - width="31" /> - <button - follows="left|top" - height="23" - image_overlay="Arrow_Right_Off" - layout="topleft" - left_pad="10" + height="20" + label="Later >" + label_selected="Later >" + layout="topleft" + left_pad="5" name="later_details_button" - picture_style="true" - tool_tip="Next" - width="31" /> + tool_tip="Go forward in time" + top_delta="0" + width="125" /> </panel> <panel - border="false" - follows="all" + border="true" + follows="left|top|right|bottom" height="180" - label="SALES" + label="Sales" layout="topleft" left_delta="0" help_topic="group_money_sales_tab" name="group_money_sales_tab" top_delta="-1" - width="300"> + width="265"> <text_editor type="string" + bg_readonly_color="0.784314 0.819608 0.8 1" follows="all" + font="Monospace" height="140" layout="topleft" - left="0" + left="8" max_length="4096" name="group_money_sales_text" - top="0" - width="300" + top="7" + width="250" word_wrap="true"> - Loading... + Computing... </text_editor> - <button - follows="left|top" - height="23" - image_overlay="Arrow_Left_Off" - layout="topleft" - name="earlier_sales_button" - picture_style="true" - tool_tip="Back" - top_pad="3" - right="-35" - width="31" /> - <button - follows="left|top" - height="23" - image_overlay="Arrow_Right_Off" - layout="topleft" - left_pad="10" + <button + height="20" + label="< Earlier" + label_selected="< Earlier" + layout="topleft" + left="5" + name="earlier_sales_button" + tool_tip="Go back in time" + top_pad="10" + width="125" /> + <button + height="20" + label="Later >" + label_selected="Later >" + layout="topleft" + left_pad="5" name="later_sales_button" - picture_style="true" - tool_tip="Next" - width="31" /> + tool_tip="Go forward in time" + top_delta="0" + width="125" /> </panel> </tab_container> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml index bfb49a60c2..0e4d490369 100644 --- a/indra/newview/skins/default/xui/en/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml @@ -1,13 +1,14 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel + border="true" follows="all" height="485" label="Notices" layout="topleft" - left="0" + left="1" name="notices_tab" - top="0" - width="313"> + top="485" + width="280"> <panel.string name="help_text"> Notices are a quick way to communicate across a @@ -19,48 +20,60 @@ the General tab. </panel.string> <panel.string name="no_notices_text"> - There are no past notices + There are no past notices. </panel.string> + <!--<text + follows="left|top" + type="string" + font="SansSerifBig" + height="16" + layout="topleft" + left="10" + name="lbl" + top_pad="10" + width="269"> + Group Notices Archive + </text> --> <text follows="left|top" type="string" word_wrap="true" - height="30" + height="40" layout="topleft" - left="10" + left_delta="10" name="lbl2" - top="5" - width="300"> - Notices are kept for 14 days -Groups are limited to 200 notices/group daily + text_color="EmphasisColor" + top_pad="10" + width="270"> + Notices are kept for 14 days. Notice lists are limited to 200 notices per group on a daily basis. </text> <scroll_list follows="left|top" column_padding="0" draw_heading="true" - heading_height="16" - height="125" + heading_height="14" + height="109" layout="topleft" - left="0" + left_delta="0" name="notice_list" top_pad="0" - width="303"> + width="265"> <scroll_list.columns label="" name="icon" - width="20" /> + width="16" /> <scroll_list.columns label="Subject" name="subject" - width="125" /> + width="100" /> <scroll_list.columns label="From" name="from" - width="90" /> + width="83" /> <scroll_list.columns label="Date" name="date" - width="30" /> + width="50" /> <scroll_list.columns name="sort" width="-1" /> @@ -71,42 +84,39 @@ Groups are limited to 200 notices/group daily layout="topleft" name="notice_list_none_found" visible="false"> - None found + None found. </text> - <button - follows="bottom|left" - height="18" - image_selected="AddItem_Press" - image_unselected="AddItem_Off" - image_disabled="AddItem_Disabled" - layout="topleft" - label="Create a new notice" - left="15" - name="create_new_notice" - picture_style="true" - tool_tip="Create a new notice" - top_delta="-5" - width="18" /> - <button - follows="top|left" - height="22" - image_overlay="Refresh_Off" + <button + follows="left|top" + height="20" + font="SansSerifSmall" + label="New Notice" + label_selected="Create New Notice" + layout="topleft" + left_delta="0" + name="create_new_notice" + top_delta="4" + width="125" /> + <button + follows="left|top" + height="20" + font="SansSerifSmall" + label="Refresh" + label_selected="Refresh List" layout="topleft" + left_pad="12" name="refresh_notices" - picture_style="true" - right="-5" - top_delta="5" - width="23" /> + top_delta="0" + width="125" /> <panel follows="left|top" - height="300" + height="268" label="Create New Notice" layout="topleft" left="0" - top_pad="10" - visible="false" name="panel_create_new_notice" - width="303"> + top_pad="10" + width="265"> <text follows="left|top" type="string" @@ -117,16 +127,30 @@ Groups are limited to 200 notices/group daily mouse_opaque="false" name="lbl" text_color="EmphasisColor" - top="0" - width="200"> + top_pad="0" + width="265"> Create a Notice </text> <text follows="left|top" type="string" + word_wrap="true" + height="90" + layout="topleft" + left_delta="0" + name="lbl2" + text_color="EmphasisColor" + top_pad="4" + width="195"> + You can add a single item to a notice by dragging it from your inventory to this panel. Attached items must be copiable and transferrable, and you can't send a folder. + </text> + <text + follows="left|top" + type="string" halign="left" height="16" layout="topleft" + left_delta="0" name="lbl3" top_pad="10" width="60"> @@ -140,7 +164,8 @@ Groups are limited to 200 notices/group daily left_pad="3" max_length="63" name="create_subject" - width="220" /> + top_delta="-1" + width="200" /> <text follows="left|top" type="string" @@ -149,100 +174,106 @@ Groups are limited to 200 notices/group daily layout="topleft" left="10" name="lbl4" - top_pad="5" + top_pad="10" width="60"> Message: </text> <text_editor - height="90" + height="75" layout="topleft" left_pad="3" max_length="511" name="create_message" top_delta="0" - width="220" + width="200" word_wrap="true" /> <text follows="left|top" type="string" halign="left" - height="14" + height="16" layout="topleft" left="10" name="lbl5" - width="200"> + top_pad="10" + width="60"> Attach: </text> <line_editor enabled="false" - height="19" + height="16" layout="topleft" - max_length="90" + left_pad="3" + max_length="63" mouse_opaque="false" name="create_inventory_name" - top_pad="2" - width="285" /> - <text - text_color="EmphasisColor" - follows="left|top" - type="string" - halign="right" - height="34" - layout="topleft" - left="10" - name="string" - top_pad="15" - word_wrap="true" - width="150"> - Drag here to attach something -- > - </text> + top_delta="0" + width="200" /> <icon - height="72" - image_name="DropTarget" + height="16" layout="topleft" - left_pad="10" - mouse_opaque="true" - name="drop_icon" - top_delta="-10" - width="72" /> + left_delta="0" + name="create_inv_icon" + top_delta="0" + width="16" /> <button follows="left|top" - height="23" - label="Remove" + height="20" + font="SansSerifSmall" + label="Remove Attachment" + label_selected="Remove Attachment" layout="topleft" - left="70" + left="10" name="remove_attachment" - top_delta="45" - width="90" /> + top_pad="10" + width="135" /> <button follows="left|top" - height="23" + height="20" + font="SansSerifSmall" label="Send" label_selected="Send Notice" layout="topleft" - right="-10" - top_pad="20" + left_delta="138" name="send_notice" - width="100" /> - <group_drop_target + top_delta="0" + width="125" /> + <panel + bevel_style="in" + border="true" + height="71" + layout="topleft" + left="200" + name="drop_target2" + top="20" + width="71" /> + <icon + height="59" + image_name="icon_groupnoticeinventory.tga" + layout="topleft" + left_delta="6" + mouse_opaque="true" + name="drop_icon" + top="26" + width="59" /> + <group_drop_target height="466" - top="0" - left="0" layout="topleft" + left="0" name="drop_target" tool_tip="Drag an inventory item onto the message box to send it with the notice. You must have permission to copy and transfer the object to send it with the notice." - width="295" /> + top="-198" + width="280" /> </panel> <panel follows="left|top" - height="300" + height="268" label="View Past Notice" layout="topleft" left="0" - visible="true" name="panel_view_past_notice" - top="180" - width="303"> + top="197" + width="265"> <text type="string" font="SansSerifBig" @@ -263,9 +294,9 @@ Groups are limited to 200 notices/group daily layout="topleft" left_delta="0" name="lbl2" - top_pad="2" + top_pad="4" width="265"> - To send a new notice, click the + button + To send a new notice, click the 'New Notice' button above. </text> <text type="string" @@ -274,7 +305,7 @@ Groups are limited to 200 notices/group daily layout="topleft" left_delta="0" name="lbl3" - top_pad="15" + top_pad="24" visible="false" width="60"> Subject: @@ -305,13 +336,13 @@ Groups are limited to 200 notices/group daily </text> <text_editor enabled="false" - height="205" + height="150" layout="topleft" left="10" max_length="511" name="view_message" top_delta="-35" - width="285" + width="260" word_wrap="true" /> <line_editor enabled="false" @@ -322,7 +353,7 @@ Groups are limited to 200 notices/group daily mouse_opaque="false" name="view_inventory_name" top_pad="10" - width="285" /> + width="260" /> <icon height="16" layout="topleft" @@ -332,12 +363,14 @@ Groups are limited to 200 notices/group daily width="16" /> <button follows="left|top" - height="23" - label="Open attachment" + height="20" + font="SansSerifSmall" + label="Open Attachment" + label_selected="Open Attachment" layout="topleft" - right="-10" + left_delta="0" name="open_attachment" - top_pad="5" + top_pad="10" width="135" /> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml index 5ed464bcec..e87859f788 100644 --- a/indra/newview/skins/default/xui/en/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel border="false" - height="552" + height="412" label="Members & Roles" layout="topleft" left="0" @@ -18,28 +18,158 @@ </panel.string> <panel.string name="help_text" /> + <!--<panel + follows="left|top" + height="80" + layout="topleft" + left="10" + name="members_header" + top_pad="10" + width="270"> + <text + type="string" + font="SansSerifBig" + height="16" + layout="topleft" + left="0" + name="static" + top="0" + width="270"> + Members & Roles + </text> + <text + type="string" + word_wrap="true" + height="40" + layout="topleft" + left_delta="0" + name="static2" + top_pad="4" + width="270"> + Group Members are assigned Roles with Abilities. These settings can easily be customized, allowing for greater organization and flexibility. + </text> + </panel> + <panel + follows="left|top" + height="24" + layout="topleft" + left_delta="0" + name="roles_header" + top_delta="0" + visible="false" + width="270"> + <text + type="string" + font="SansSerifBig" + height="16" + layout="topleft" + left="0" + name="static" + top="0" + width="270"> + Roles + </text> + <text + type="string" + word_wrap="true" + height="40" + layout="topleft" + left_delta="0" + name="role_properties_modifiable" + top_pad="4" + visible="false" + width="270"> + Select a Role below. You can modify its Name, Description and Member Title. + </text> + <text + type="string" + word_wrap="true" + height="40" + layout="topleft" + left_delta="0" + name="role_properties_not_modifiable" + top_delta="0" + width="270"> + Select a Role below to see its properties, Members and allowed Abilities. + </text> + <text + type="string" + word_wrap="true" + height="16" + layout="topleft" + left_delta="0" + name="role_actions_modifiable" + top_delta="24" + visible="false" + width="270"> + You can also assign Abilities to the Role. + </text> + <text + type="string" + word_wrap="true" + height="16" + layout="topleft" + left_delta="0" + name="role_actions_not_modifiable" + top_delta="0" + width="270"> + You may view, but not modify, assigned Abilities. + </text> + </panel> + <panel + follows="left|top" + height="24" + layout="topleft" + left_delta="0" + name="actions_header" + top_delta="0" + visible="false" + width="270"> + <text + type="string" + font="SansSerifBig" + height="16" + layout="topleft" + left="0" + name="static" + top="0" + width="270"> + Abilities + </text> + <text + type="string" + word_wrap="true" + height="40" + layout="topleft" + left_delta="0" + name="static2" + top_pad="4" + width="270"> + You can view an Ability's Description and which Roles and Members can execute the Ability. + </text> + </panel> --> <tab_container - border="false" + border="true" follows="left|top" - height="245" + height="260" halign="center" layout="topleft" left="5" name="roles_tab_container" tab_position="top" tab_height="20" - tab_min_width="96" - top="3" + top="0" width="303"> <panel border="false" - height="220" - label="MEMBERS" + height="260" + label="Members" layout="topleft" - left="0" + left="1" help_topic="roles_members_tab" name="members_sub_tab" tool_tip="Members" + top="17" class="panel_group_members_subtab" width="300"> <panel.string @@ -57,7 +187,8 @@ clicking on their names. follows="left|top|right" max_length="250" label="Filter Members" - name="filter_input" /> + name="filter_input" + font="SansSerif" /> <!-- <button enabled="false" font="SansSerifSmall" @@ -98,7 +229,6 @@ clicking on their names. font="SansSerifSmall" label="Invite" layout="topleft" - left="5" name="member_invite" top_pad="3" width="100" /> @@ -108,10 +238,8 @@ clicking on their names. label="Eject" layout="topleft" left_pad="5" - right="-5" name="member_eject" width="100" /> - <!--What is this?--> <icon height="16" image_name="Inv_FolderClosed" @@ -122,14 +250,15 @@ clicking on their names. </panel> <panel border="false" - height="220" - label="ROLES" + height="164" + label="Roles" layout="topleft" - left="0" + left_delta="0" help_topic="roles_roles_tab" name="roles_sub_tab" class="panel_group_roles_subtab" - width="300"> + top="17" + width="265"> <panel.string name="help_text"> Roles have a title and an allowed list of Abilities @@ -153,19 +282,40 @@ including the Everyone and Owner Roles. name="power_partial_icon"> checkbox_enabled_false.tga </panel.string> - <filter_editor - layout="topleft" - top="10" - left="4" - width="280" - height="20" - follows="left|top|right" - max_length="250" - label="Filter Roles" - name="filter_input" /> - <!-- + <filter_editor + layout="topleft" + top="10" + left="4" + width="260" + height="20" + follows="left|top|right" + max_length="250" + label="Filter Roles" + name="filter_input" + font="SansSerif" /> + <!--<line_editor + border_style="line" + border_thickness="1" + follows="left|top" + height="16" + layout="topleft" + left="4" + max_length="63" + name="search_text" + top="10" + width="90" /> + <button + font="SansSerifSmall" + height="20" + label="Search" + layout="topleft" + left_pad="5" + name="search_button" + top_delta="-2" + width="80" /> <button enabled="false" + font="SansSerifSmall" height="20" label="Show All" layout="topleft" @@ -176,13 +326,11 @@ including the Everyone and Owner Roles. <scroll_list column_padding="0" draw_heading="true" - draw_stripes="false" follows="left|top" heading_height="20" height="150" layout="topleft" - search_column="1" - left="0" + left="4" name="role_list" top_pad="4" width="300"> @@ -204,7 +352,7 @@ including the Everyone and Owner Roles. font="SansSerifSmall" label="Add Role" layout="topleft" - left="5" + left_delta="0" name="role_create" top_pad="6" width="125" /> @@ -214,20 +362,20 @@ including the Everyone and Owner Roles. label="Delete Role" layout="topleft" left_pad="5" - right="-5" name="role_delete" top_delta="0" width="125" /> </panel> <panel border="false" - height="220" - label="ABILITIES" + height="164" + label="Abilities" layout="topleft" - left="0" + left_delta="0" help_topic="roles_actions_tab" name="actions_sub_tab" class="panel_group_actions_subtab" + top="17" tool_tip="You can view an Ability's Description and which Roles and Members can execute the Ability." width="300"> <panel.string @@ -235,17 +383,37 @@ including the Everyone and Owner Roles. Abilities allow Members in Roles to do specific things in this group. There's a broad variety of Abilities. </panel.string> - <filter_editor - layout="topleft" - top="10" - left="4" - width="280" - height="20" - follows="left|top|right" - max_length="250" - label="Filter Abilities" - name="filter_input" /> - <!-- + <filter_editor + layout="topleft" + top="10" + left="4" + width="255" + height="20" + follows="left|top|right" + max_length="250" + label="Filter Abilities" + name="filter_input" + font="SansSerif" /> + <!--<line_editor + border_style="line" + border_thickness="1" + follows="left|top" + height="16" + layout="topleft" + left="4" + max_length="63" + name="search_text" + top="10" + width="90" /> + <button + font="SansSerifSmall" + height="20" + label="Search" + layout="topleft" + left_pad="5" + name="search_button" + top_delta="-2" + width="80" /> <button enabled="false" font="SansSerifSmall" @@ -260,19 +428,19 @@ things in this group. There's a broad variety of Abilities. column_padding="0" draw_stripes="false" follows="left|top" - height="160" + height="100" layout="topleft" - left="0" + left="6" multi_select="true" name="action_list" search_column="1" tool_tip="Select an Ability to view more details" top_pad="6" - width="300"> + width="255"> <scroll_list.columns label="" name="icon" - width="16" /> + width="18" /> <scroll_list.columns label="" name="action" @@ -280,7 +448,7 @@ things in this group. There's a broad variety of Abilities. </scroll_list> <icon height="16" - image_name="Inv_FolderClosed" + image_name="inv_folder_plain_closed.tga" layout="topleft" name="power_folder_icon" visible="false" @@ -288,93 +456,105 @@ things in this group. There's a broad variety of Abilities. </panel> </tab_container> <panel - height="252" + height="150" layout="topleft" follows="left|top" left="10" name="members_footer" - top_pad="10" - top_delta="0" + top_pad="2" width="300"> <text type="string" + font="SansSerif" height="16" layout="topleft" follows="left|top" left="0" name="static" - top_pad="5" - width="295"> + top_pad="0" + width="100"> Assigned Roles </text> + <text + type="string" + font="SansSerif" + height="16" + layout="topleft" + follows="left|top" + left_pad="35" + name="static2" + top_delta="0" + width="100"> + Allowed Abilities + </text> <scroll_list draw_stripes="false" follows="left|top" - height="80" + height="150" layout="topleft" left="0" name="member_assigned_roles" - top_pad="0" - width="295"> + top_pad="5" + width="130"> <scroll_list.columns label="" name="checkbox" - width="30" /> + width="18" /> <scroll_list.columns label="" name="role" - width="265" /> + width="107" /> </scroll_list> - <text - type="string" - height="16" - layout="topleft" - follows="left|top" - left="0" - name="static2" - top_pad="5" - width="295"> - Allowed Abilities - </text> - <scroll_list + <scroll_list draw_stripes="false" - height="80" + height="150" layout="topleft" - left="0" + follows="left|top" + left_pad="5" name="member_allowed_actions" - search_column="2" tool_tip="For details of each allowed ability see the abilities tab" - top_pad="0" - width="295"> + top_delta="0" + width="130"> <scroll_list.columns label="" name="icon" - width="20" /> + width="14" /> <scroll_list.columns label="" name="action" - width="275" /> + width="126" /> </scroll_list> </panel> <panel - height="297" + height="252" layout="topleft" - left="10" + left_delta="0" name="roles_footer" top_delta="0" - top="245" visible="false" - width="300"> + width="270"> <text type="string" + font="SansSerif" height="16" layout="topleft" left="0" name="static" top="0" - width="140"> + width="100"> Name </text> + <text + type="string" + font="SansSerif" + height="16" + layout="topleft" + left_pad="35" + name="static2" + top_delta="0" + width="100"> + Description + </text> <line_editor type="string" border_style="line" @@ -383,19 +563,21 @@ things in this group. There's a broad variety of Abilities. height="20" layout="topleft" left="0" - max_length="295" + max_length="20" name="role_name" top_pad="0" - width="295"> + width="130"> Employees </line_editor> <text type="string" + font="SansSerif" height="16" layout="topleft" + left_delta="0" name="static3" - top_pad="5" - width="295"> + top_pad="10" + width="100"> Title </text> <line_editor @@ -405,159 +587,158 @@ things in this group. There's a broad variety of Abilities. follows="left|top" height="20" layout="topleft" - max_length="295" + left_delta="0" + max_length="20" name="role_title" top_pad="0" - width="295"> - (waiting) + width="130"> + (waiting) </line_editor> - <text - type="string" - height="16" - layout="topleft" - left="0" - name="static2" - top_pad="5" - width="100"> - Description - </text> <text_editor type="string" halign="left" - height="35" + height="48" layout="topleft" - left="0" - max_length="295" + left="135" + max_length="254" name="role_description" - top_pad="0" - width="295" + top="16" + width="130" word_wrap="true"> - (waiting) + (waiting) </text_editor> <text type="string" + font="SansSerif" height="16" layout="topleft" - follows="left|top" left="0" - name="static" - top_pad="5" - width="295"> - Assigned Roles + name="static4" + top="85" + width="120"> + Assigned Members + </text> + <text + type="string" + font="SansSerif" + height="16" + layout="topleft" + left_pad="15" + name="static5" + tool_tip="A list of abilities the currently selected role can perform" + top_delta="0" + width="100"> + Allowed Abilities </text> <name_list draw_stripes="false" - height="50" + height="150" layout="topleft" left="0" name="role_assigned_members" top_pad="0" - width="295" /> + width="130" /> <check_box - height="15" - label="Reveal members" + height="16" + label="Members are visible" layout="topleft" + left_delta="0" name="role_visible_in_list" tool_tip="Sets whether members of this role are visible in the General tab to people outside of the group." - top_pad="3" - width="290" /> - <text - type="string" - height="16" - layout="topleft" - follows="left|top" - left="0" - name="static2" - top_pad="5" - width="295"> - Allowed Abilities - </text> + top_pad="10" + width="130" /> <scroll_list draw_stripes="false" - height="50" + height="150" layout="topleft" - left="0" + left="135" name="role_allowed_actions" search_column="2" tool_tip="For details of each allowed ability see the abilities tab" - top_pad="0" - width="295"> + top="101" + width="130"> <scroll_list.columns label="" name="icon" - width="20" /> + width="2" /> <scroll_list.columns label="" name="checkbox" - width="20" /> + width="16" /> <scroll_list.columns label="" name="action" - width="250" /> + width="220" /> </scroll_list> </panel> <panel - height="303" + height="215" layout="topleft" - left="10" + left_delta="0" name="actions_footer" top_delta="0" - top="245" visible="false" - width="300"> + width="265"> <text type="string" + font="SansSerif" height="16" layout="topleft" + left="0" name="static" + top="0" width="200"> - Ability description + Description </text> <text_editor type="string" enabled="false" halign="left" - height="80" + height="48" layout="topleft" left_delta="0" max_length="512" name="action_description" top_pad="0" - width="295" + width="265" word_wrap="true"> This Ability is 'Eject Members from this Group'. Only an Owner can eject another Owner. </text_editor> <text type="string" + font="SansSerif" height="16" layout="topleft" left_delta="0" name="static2" - top_pad="5" - width="295"> - Roles with this ability + top_pad="10" + width="125"> + Roles with Ability </text> - <scroll_list - height="60" - layout="topleft" - left="0" - name="action_roles" - top_pad="0" - width="295" /> - <text + <text type="string" + font="SansSerif" height="16" layout="topleft" + left_pad="10" name="static3" - top_pad="5" - width="295"> - Members with this ability + top_delta="0" + width="125"> + Members with Ability </text> + <scroll_list + height="150" + layout="topleft" + left="0" + name="action_roles" + top="90" + width="130" /> <name_list - height="100" + height="150" layout="topleft" + left_pad="5" name="action_members" - top_pad="0" - width="295" /> + top_delta="0" + width="130" /> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml index 0dd3878426..c4cdaa41f9 100644 --- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml @@ -1,35 +1,30 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel name="panel_im_control_panel" - width="128" - height="327" + width="125" + height="248" border="false"> <avatar_icon name="avatar_icon" - follows="left|top" - left_delta="3" - width="125" - height="125" /> + width="96" + height="96" /> <button name="view_profile_btn" - follows="left|bottom" label="View Profile" + left_delta="3" width="125" height="20" /> <button name="add_friend_btn" - follows="left|bottom" label="Add Friend" width="125" height="20" /> <button name="call_btn" - follows="left|bottom" label="Call" width="125" height="20" /> <button - follows="left|bottom" height="20" label="End Call" name="end_call_btn" @@ -38,27 +33,15 @@ <button enabled="false" - follows="left|bottom" name="voice_ctrls_btn" label="Open Voice Controls" width="125" height="20" visible="false"/> - <button name="teleport_btn" - follows="left|bottom" - label="Teleport" - width="125" - height="20" /> <button name="share_btn" - follows="left|bottom" label="Share" width="125" height="20" /> - <button name="pay_btn" - follows="left|bottom" - label="Pay" - width="125" - height="20" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml deleted file mode 100644 index 03ba7f7c81..0000000000 --- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml +++ /dev/null @@ -1,257 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel - background_visible="true" - follows="all" - height="570" - layout="topleft" - left="0" - min_height="350" - name="landmark_info" - top="20" - width="330"> - <string - name="title_create_landmark" - value="Create Landmark" /> - <string - name="title_edit_landmark" - value="Edit Landmark" /> - <string - name="title_landmark" - value="Landmark" /> - <string - name="not_available" - value="(N\A)" /> - <string - name="unknown" - value="(unknown)" /> - <string - name="public" - value="(public)" /> - <string - name="server_update_text"> - Place information not available without server update. - </string> - <string - name="server_error_text"> - Information about this location is unavailable at this time, please try again later. - </string> - <string - name="server_forbidden_text"> - Information about this location is unavailable due to access restrictions. Please check your permissions with the parcel owner. - </string> - <string - name="acquired_date"> - [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] - </string> - <button - follows="top|right" - height="23" - image_overlay="BackArrow_Off" - layout="topleft" - left="10" - name="back_btn" - picture_style="true" - tab_stop="false" - top="0" - width="23" /> - <text - follows="top|left|right" - font="SansSerifHugeBold" - height="26" - layout="topleft" - left_pad="10" - name="title" - text_color="white" - top="0" - use_ellipses="true" - value="Place Profile" - width="275" /> - <scroll_container - color="DkGray2" - follows="all" - height="533" - layout="topleft" - left="10" - name="place_scroll" - opaque="true" - top_pad="5" - width="313"> - <panel - bg_alpha_color="DkGray2" - follows="all" - height="533" - layout="topleft" - left="0" - min_height="300" - name="scrolling_panel" - top="0" - width="313"> - <texture_picker - enabled="false" - follows="top|left" - height="190" - layout="topleft" - left="10" - name="logo" - top="10" - width="290" /> - <text - follows="left|top|right" - font="SansSerifLarge" - height="14" - layout="topleft" - left="10" - name="region_title" - text_color="white" - top_pad="5" - use_ellipses="true" - value="SampleRegion" - width="290" /> - <text - follows="left|top|right" - height="14" - layout="topleft" - left="10" - name="parcel_title" - top_pad="4" - use_ellipses="true" - value="SampleParcel, Name Long (145, 228, 26)" - width="285" /> - <expandable_text - follows="left|top|right" - height="50" - layout="topleft" - left="5" - name="description" - top_pad="10" - value="Du waltz die spritz" - width="300" /> - <panel - follows="left|top|right" - height="55" - layout="topleft" - left="10" - name="landmark_info_panel" - top_pad="10" - width="290"> - <text - follows="left|top" - height="15" - layout="topleft" - left="0" - name="owner_label" - top_pad="10" - value="Owner:" - width="90" /> - <text - follows="left|top|right" - height="15" - layout="topleft" - left="70" - name="owner" - top_delta="0" - width="200" /> - <text - follows="left|top" - height="15" - layout="topleft" - left="0" - name="creator_label" - value="Creator:" - width="90" /> - <text - follows="left|top|right" - height="15" - layout="topleft" - left="70" - name="creator" - top_delta="0" - width="200" /> - <text - follows="left|top" - height="15" - layout="topleft" - left="0" - name="created_label" - value="Created:" - width="50" /> - <text - follows="left|top|right" - height="15" - layout="topleft" - left="70" - name="created" - top_delta="0" - width="200" /> - </panel> - <panel - follows="left|top|right" - height="210" - layout="topleft" - left="10" - name="landmark_edit_panel" - width="290"> - <text - follows="left|top" - height="15" - layout="topleft" - left="0" - name="title_label" - top_pad="10" - value="Title:" - width="290" /> - <line_editor - background_image_disabled="task_panel_background.png" - follows="left|top|right" - height="22" - layout="topleft" - left="0" - max_length="63" - name="title_editor" - prevalidate_callback="ascii" - text_readonly_color="white" - top_pad="5" - width="290" /> - <text - follows="left|top" - height="15" - layout="topleft" - left="0" - name="notes_label" - top_pad="10" - value="My notes:" - width="290" /> - <text_editor - bg_readonly_color="DkGray2" - follows="all" - height="70" - layout="topleft" - left="0" - max_length="127" - name="notes_editor" - read_only="true" - text_readonly_color="white" - top_pad="5" - width="290" - wrap="true" /> - <text - follows="left|top" - height="15" - layout="topleft" - left="0" - name="folder_label" - top_pad="15" - value="Landmark location:" - width="290" /> - <combo_box - follows="bottom|left|right" - height="20" - layout="topleft" - left="0" - name="folder_combo" - top_pad="5" - width="200" /> - </panel> - </panel> - </scroll_container> -</panel> diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml index 91fcf4b5f2..5293043ba7 100644 --- a/indra/newview/skins/default/xui/en/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml @@ -31,7 +31,7 @@ left="0" mouse_opaque="true" name="favorites_list" - start_folder="Favorite" + start_folder="favorite" width="380"/> </accordion_tab> <accordion_tab @@ -47,7 +47,7 @@ left="0" mouse_opaque="true" name="landmarks_list" - start_folder="Landmarks" + start_folder="landmark" width="380"/> </accordion_tab> <accordion_tab @@ -63,13 +63,13 @@ left="0" mouse_opaque="true" name="my_inventory_list" - start_folder="INVENTORY" + start_folder="inventory" width="380"/> - </accordion_tab> - <accordion_tab - layout="topleft" - name="tab_library" - title="Library"> + </accordion_tab> + <accordion_tab + layout="topleft" + name="tab_library" + title="Library"> <inventory_subtree_panel allow_multi_select="true" border="true" @@ -79,7 +79,7 @@ left="0" mouse_opaque="true" name="library_list" - start_folder="LIBRARY" + start_folder="library" width="380"/> </accordion_tab> </accordion> diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml index 555fedb1ff..2182163da5 100644 --- a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml @@ -42,17 +42,13 @@ width="20" /> <button follows="right" - is_toggle="true" width="45" top="0" layout="topleft" left_pad="8" label="Log" height="23" - name="show_nearby_chat" tool_tip="Show/hide nearby chat log"> - <button.init_callback - function="Button.SetDockableFloaterToggle" - parameter="nearby_chat" /> + <button.commit_callback function="Floater.Toggle" parameter="nearby_chat"/> </button> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml index 3cc9c3f38a..a67ae59b4a 100644 --- a/indra/newview/skins/default/xui/en/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml @@ -30,7 +30,7 @@ text_color="white" top="0" value="Pick Info" - use_ellipses="true" + use_elipsis="true" width="275" /> <scroll_container color="DkGray2" diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml deleted file mode 100644 index 7e073f064d..0000000000 --- a/indra/newview/skins/default/xui/en/panel_place_profile.xml +++ /dev/null @@ -1,979 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel - background_visible="true" - follows="all" - height="570" - layout="topleft" - left="0" - min_height="350" - name="place_profile" - top="20" - width="330"> - <string - name="on" - value="On" /> - <string - name="off" - value="Off" /> - <string - name="anyone" - value="Anyone" /> - <string - name="available" - value="available" /> - <string - name="allocated" - value="allocated" /> - <string - name="title_place" - value="Place Profile" /> - <string - name="title_teleport_history" - value="Teleport History Location" /> - <string - name="not_available" - value="(N\A)" /> - <string - name="unknown" - value="(unknown)" /> - <string - name="public" - value="(public)" /> - <string - name="none_text" - value="(none)" /> - <string - name="sale_pending_text" - value="(Sale Pending)" /> - <string - name="group_owned_text" - value="(Group Owned)" /> - <string - name="price_text" - value="L$" /> - <string - name="area_text" - value="m²" /> - <string - name="all_residents_text" - value="All Residents" /> - <string - name="group_text" - value="Group" /> - <string - name="can_resell"> - Purchased land in this region may be resold. - </string> - <string - name="can_not_resell"> - Purchased land in this region may not be resold. - </string> - <string - name="can_change"> - Purchased land in this region may be joined or subdivided. - </string> - <string - name="can_not_change"> - Purchased land in this region may not be joined or subdivided. - </string> - <string - name="server_update_text"> - Place information not available without server update. - </string> - <string - name="server_error_text"> - Information about this location is unavailable at this time, please try again later. - </string> - <string - name="server_forbidden_text"> - Information about this location is unavailable due to access restrictions. Please check your permissions with the parcel owner. - </string> - <string - name="acquired_date"> - [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] - </string> - <button - follows="top|right" - height="23" - image_overlay="BackArrow_Off" - layout="topleft" - left="10" - name="back_btn" - picture_style="true" - tab_stop="false" - top="0" - width="23" /> - <text - follows="top|left|right" - font="SansSerifHugeBold" - height="26" - layout="topleft" - left_pad="10" - name="title" - text_color="white" - top="0" - use_ellipses="true" - value="Place Profile" - width="275" /> - <scroll_container - color="DkGray2" - follows="all" - height="533" - layout="topleft" - left="10" - name="place_scroll" - opaque="true" - top_pad="5" - width="313"> - <panel - bg_alpha_color="DkGray2" - follows="all" - height="533" - layout="topleft" - left="0" - min_height="300" - name="scrolling_panel" - top="0" - value=">" - width="313"> - <texture_picker - enabled="false" - follows="top|left" - height="190" - layout="topleft" - left="10" - name="logo" - top="10" - width="290" /> - <layout_stack - border_size="0" - clip="false" - follows="all" - height="50" - layout="topleft" - mouse_opaque="false" - name="panel_stack" - orientation="horizontal" - top_pad="-65" - width="100"> - <layout_panel - follows="left|right" - height="50" - layout="topleft" - left="0" - min_height="50" - min_width="50" - mouse_opaque="false" - name="here_panel" - top="0" - user_resize="false" - width="60"> - <icon - follows="top|left" - height="50" - image_name="YouAreHere_Badge" - layout="topleft" - left="0" - name="icon_you_are_here" - top="0" - width="50" /> - </layout_panel> - <layout_panel - follows="left|right" - height="60" - layout="topleft" - min_height="50" - min_width="60" - mouse_opaque="false" - name="for_sale_panel" - top="0" - user_resize="false" - width="60"> - <icon - follows="top|left" - height="50" - image_name="ForSale_Badge" - layout="topleft" - left="10" - name="icon_for_sale" - top="0" - width="50" /> - </layout_panel> - </layout_stack> - <text - follows="left|top|right" - font="SansSerifLarge" - height="14" - layout="topleft" - left="10" - name="region_title" - text_color="white" - top_pad="5" - use_ellipses="true" - value="SampleRegion" - width="290" /> - <!-- <icon - follows="top|right" - height="16" - image_name="Icon_For_Sale" - layout="topleft" - left="3" - mouse_opaque="true" - name="icon_for_sale" - width="16" />--> - <text - follows="left|top|right" - height="14" - layout="topleft" - left="10" - name="parcel_title" - top_pad="4" - use_ellipses="true" - value="SampleParcel, Name Long (145, 228, 26)" - width="285" /> - <expandable_text - follows="left|top|right" - height="50" - layout="topleft" - left="5" - name="description" - top_pad="10" - value="Du waltz die spritz" - width="300" /> - <text - follows="left|top" - height="14" - layout="topleft" - left="10" - name="owner_label" - text_color="White" - top_pad="0" - value="Owner:" - width="90" /> - <!--TODO: HOOK THIS NAME UP WITH AN INSPECTOR --> - <text - follows="left|top|right" - height="14" - layout="topleft" - left_pad="1" - name="owner_value" - top_delta="0" - value="Alex Superduperlongenamenton" - width="205" /> - <accordion - follows="all" - height="230" - layout="topleft" - left="0" - name="advanced_info_accordion" - top_pad="10" - width="313"> - <accordion_tab - layout="topleft" - name="parcel_characteristics_tab" - title="Parcel"> - <scroll_container - color="DkGray2" - follows="all" - height="132" - layout="topleft" - left="0" - name="parcel_scroll" - opaque="true" - top="0" - width="290"> - <panel - follows="all" - height="165" - layout="topleft" - left="0" - top="0" - width="275"> - <icon - follows="top|left" - height="16" - image_name="parcel_drk_M" - layout="topleft" - left="20" - name="icon_M" - top="0" - width="18" /> - <icon - follows="top|left" - height="16" - image_name="parcel_drk_R" - layout="topleft" - left="20" - name="icon_R" - top="0" - width="18" /> - <icon - follows="top|left" - height="16" - image_name="parcel_drk_PG" - layout="topleft" - left="20" - name="icon_PG" - top="0" - visible="false" - width="18" /> - <text - follows="left|top" - height="16" - layout="topleft" - left_pad="8" - name="rating_label" - value="Rating:" - width="80" /> - <text - follows="right|top" - height="16" - layout="topleft" - left_pad="0" - name="rating_value" - top_delta="0" - value="Mature" - width="120" /> - <icon - follows="top|left" - height="18" - image_name="parcel_drk_Voice" - layout="topleft" - left="20" - name="icon_Voice" - top_pad="5" - width="22" /> - <icon - follows="top|left" - height="18" - image_name="parcel_drk_VoiceNo" - layout="topleft" - left="20" - name="icon_VoiceNo" - top_delta="0" - visible="false" - width="22" /> - <text - follows="left|top" - height="18" - layout="topleft" - left_pad="8" - name="voice_label" - top_delta="0" - value="Voice:" - width="76" /> - <text - follows="right|top" - height="18" - layout="topleft" - left_pad="0" - name="voice_value" - top_delta="0" - value="On" - width="60" /> - <icon - follows="top|left" - height="18" - image_name="parcel_drk_Fly" - layout="topleft" - left="20" - name="icon_Fly" - top_pad="3" - width="22" /> - <icon - follows="top|left" - height="18" - image_name="parcel_drk_FlyNo" - layout="topleft" - left="20" - name="icon_FlyNo" - top_delta="0" - visible="false" - width="22" /> - <text - follows="left|top" - height="16" - layout="topleft" - left_pad="8" - name="fly_label" - value="Fly:" - width="76" /> - <text - follows="right|top" - height="16" - layout="topleft" - left_pad="0" - name="fly_value" - top_delta="0" - value="On" - width="60" /> - <icon - follows="top|left" - height="18" - image_name="parcel_drk_Push" - layout="topleft" - left="20" - name="icon_Push" - top_pad="3" - visible="false" - width="22" /> - <icon - follows="top|left" - height="18" - image_name="parcel_drk_PushNo" - layout="topleft" - left="20" - name="icon_PushNo" - top_delta="0" - width="22" /> - <text - follows="left|top" - height="14" - layout="topleft" - left_pad="8" - name="push_label" - value="Push:" - width="76" /> - <text - follows="right|top" - height="14" - layout="topleft" - left_pad="0" - name="push_value" - top_delta="0" - value="Off" - width="60" /> - <icon - follows="top|left" - height="18" - image_name="parcel_drk_Build" - layout="topleft" - left="20" - name="icon_Build" - top_pad="3" - width="22" /> - <icon - follows="top|left" - height="18" - image_name="parcel_drk_BuildNo" - layout="topleft" - left="20" - name="icon_BuildNo" - top_delta="0" - visible="false" /> - <text - follows="left|top" - height="14" - layout="topleft" - left_pad="8" - name="build_label" - value="Build:" - width="76" /> - <text - follows="right|top" - height="15" - layout="topleft" - left_pad="0" - name="build_value" - top_delta="0" - value="On" - width="60" /> - <icon - follows="top|left" - height="18" - image_name="parcel_drk_Scripts" - layout="topleft" - left="20" - name="icon_Scripts" - top_pad="3" - width="22" /> - <icon - follows="top|left" - height="18" - image_name="parcel_drk_ScriptsNo" - layout="topleft" - left="20" - name="icon_ScriptsNo" - top_delta="0" - visible="false" /> - <text - follows="left|top" - height="14" - layout="topleft" - left_pad="8" - name="scripts_label" - value="Scripts:" - width="76" /> - <text - follows="right|top" - height="14" - layout="topleft" - left_pad="0" - name="scripts_value" - top_delta="0" - value="On" - width="60" /> - <icon - follows="top|left" - height="18" - image_name="parcel_drk_Damage" - layout="topleft" - left="20" - name="icon_Damage" - top_pad="7" - visible="false" - width="22" /> - <icon - follows="top|left" - height="18" - image_name="parcel_drk_DamageNo" - layout="topleft" - left="20" - name="icon_DamageNo" - top_delta="0" /> - <text - follows="left|top" - height="14" - layout="topleft" - left_pad="8" - name="damage_label" - value="Damage:" - width="76" /> - <text - follows="right|top" - height="14" - layout="topleft" - left_pad="0" - name="damage_value" - top_delta="0" - value="Off" - width="60" /> - <button - follows="bottom|right" - height="19" - label="About Land" - layout="topleft" - name="about_land_btn" - right="-5" - tab_stop="false" - top="138" - width="90"> - <click_callback - function="ShowFloater" - parameter="about_land" /> - </button> - </panel> - </scroll_container> - </accordion_tab> - <accordion_tab - expanded="false" - layout="topleft" - name="region_information_tab" - title="Region"> - <panel - follows="all" - height="125" - layout="topleft" - left="0" - top="0" - width="290"> - <text - follows="left|top" - height="15" - layout="topleft" - left="10" - name="region_name_label" - top_pad="5" - value="Region:" - width="80" /> - <text - follows="left|top|right" - height="15" - layout="topleft" - left_pad="0" - name="region_name" - top_delta="0" - value="Mooseland" - width="195" /> - <text - follows="left|top" - height="15" - layout="topleft" - left="10" - name="region_type_label" - top_pad="5" - value="Type:" - width="80" /> - <text - follows="left|top|right" - height="15" - layout="topleft" - left_pad="0" - name="region_type" - top_delta="0" - value="Moose" - width="195" /> - <text - follows="left|top" - height="15" - layout="topleft" - left="10" - name="region_rating_label" - top_pad="7" - value="Rating:" - width="80" /> - <icon - follows="top|left" - height="16" - image_name="parcel_drk_M" - layout="topleft" - left_pad="0" - name="icon_M" - width="18" /> - <icon - follows="top|left" - height="16" - image_name="parcel_drk_R" - layout="topleft" - left_delta="0" - name="icon_R" - top_delta="0" - visible="false" - width="18" /> - <icon - follows="top|left" - height="16" - image_name="parcel_drk_PG" - layout="topleft" - left_delta="0" - name="icon_PG" - top_delta="0" - visible="false" - width="18" /> - <text - follows="left|top|right" - height="15" - layout="topleft" - left_pad="10" - name="region_rating" - value="Explicit" - width="100" /> - <text - follows="left|top" - height="15" - layout="topleft" - left="10" - name="region_owner_label" - top_pad="5" - value="Owner:" - width="80" /> - <text - follows="left|top|right" - height="15" - layout="topleft" - left_pad="0" - name="region_owner" - top_delta="0" - value="moose Van Moose" - width="195" /> - <text - follows="left|top" - height="15" - layout="topleft" - left="10" - name="region_group_label" - top_pad="5" - value="Group:" - width="80" /> - <text - follows="left|top|right" - height="15" - layout="topleft" - left_pad="0" - name="region_group" - top_delta="0" - use_ellipses="true" - width="195"> - The Mighty Moose of mooseville soundvillemoose - </text> - <button - follows="bottom|right" - height="19" - label="Region/Estate" - layout="topleft" - name="region_info_btn" - right="-5" - tab_stop="false" - width="105"> - <click_callback - function="ShowFloater" - parameter="region_info" /> - </button> - </panel> - </accordion_tab> - <accordion_tab - expanded="false" - layout="topleft" - name="estate_information_tab" - title="Estate"> - <panel - follows="all" - height="189" - layout="topleft" - left="0" - top="0" - width="290"> - <text - follows="left|top" - height="15" - layout="topleft" - left="10" - name="estate_name_label" - top_pad="5" - value="Estate:" - width="80" /> - <text - follows="left|top|right" - height="15" - layout="topleft" - left="90" - name="estate_name" - top_delta="0" - width="160" /> - <text - follows="left|top" - height="15" - layout="topleft" - left="10" - name="estate_rating_label" - top_pad="5" - value="Rating:" - width="80" /> - <text - follows="left|top|right" - height="15" - layout="topleft" - left="90" - name="estate_rating" - top_delta="0" - width="160" /> - <text - follows="left|top" - height="15" - layout="topleft" - left="10" - name="estate_owner_label" - top_pad="5" - value="Owner:" - width="80" /> - <text - follows="left|top|right" - height="15" - layout="topleft" - left="90" - name="estate_owner" - top_delta="0" - width="160" /> - <text - follows="left|top" - height="15" - layout="topleft" - left="10" - name="covenant_label" - top_pad="5" - value="Covenant:" - width="220" /> - <text_editor - bg_focus_color="DkGray2" - bg_readonly_color="DkGray2" - follows="left|top|right" - handle_edit_keys_directly="true" - height="90" - layout="topleft" - left="10" - max_length="65535" - name="covenant" - read_only="true" - top_pad="0" - width="280" /> - </panel> - </accordion_tab> - <accordion_tab - expanded="false" - layout="topleft" - name="sales_tab" - title="For Sale"> - <panel - follows="all" - height="300" - layout="topleft" - left="0" - top="0" - width="290"> - <text - follows="left|top" - height="15" - layout="topleft" - left="10" - name="sales_price_label" - top_pad="5" - value="Price:" - width="100" /> - <text - follows="left|top|right" - height="15" - layout="topleft" - left="110" - name="sales_price" - top_delta="0" - width="140" /> - <text - follows="left|top" - height="15" - layout="topleft" - left="10" - name="area_label" - top_pad="5" - value="Area:" - width="100" /> - <text - follows="left|top|right" - height="15" - layout="topleft" - left="110" - name="area" - top_delta="0" - width="140" /> - <text - follows="left|top" - height="15" - layout="topleft" - left="10" - name="traffic_label" - top_pad="5" - value="Traffic:" - width="100" /> - <text - follows="left|top|right" - height="15" - layout="topleft" - left="110" - name="traffic" - top_delta="0" - width="140" /> - <text - follows="left|top" - height="15" - layout="topleft" - left="10" - name="primitives_label" - top_pad="5" - value="Primitives:" - width="100" /> - <text - follows="left|top|right" - height="15" - layout="topleft" - left="110" - name="primitives" - top_delta="0" - width="140" /> - <text - follows="left|top" - height="15" - layout="topleft" - left="10" - name="parcel_scripts_label" - top_pad="5" - value="Scripts:" - width="100" /> - <text - follows="left|top|right" - height="15" - layout="topleft" - left="110" - name="parcel_scripts" - top_delta="0" - width="140" /> - <text - follows="left|top" - height="15" - layout="topleft" - left="10" - name="terraform_limits_label" - top_pad="5" - value="Terraform limits:" - width="100" /> - <text - follows="left|top|right" - height="15" - layout="topleft" - left="110" - name="terraform_limits" - top_delta="0" - width="140" /> - <text - follows="left|top" - height="15" - layout="topleft" - left="10" - name="subdivide_label" - top_pad="5" - value="Subdivide/Join ability:" - width="220" /> - <text_editor - bg_focus_color="DkGray2" - bg_readonly_color="DkGray2" - follows="left|top|right" - height="45" - layout="topleft" - left="10" - max_length="65535" - name="subdivide" - read_only="true" - top_pad="5" - width="245" /> - <text - follows="left|top" - height="15" - layout="topleft" - left="10" - name="resale_label" - top_pad="5" - value="ReSale ability:" - width="80" /> - <text_editor - bg_focus_color="DkGray2" - bg_readonly_color="DkGray2" - follows="left|top|right" - height="45" - layout="topleft" - left="10" - max_length="65535" - name="resale" - read_only="true" - top_pad="5" - width="245" /> - <text - follows="left|top" - height="15" - layout="topleft" - left="10" - name="sale_to_label" - top_pad="5" - value="For sale to:" - width="80" /> - <text - follows="left|top|right" - height="15" - layout="topleft" - left="90" - name="sale_to" - top_delta="0" - width="160" /> - </panel> - </accordion_tab> - </accordion> - </panel> - </scroll_container> -</panel> diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml index 87ac5be74a..5aa53ab46b 100644 --- a/indra/newview/skins/default/xui/en/panel_places.xml +++ b/indra/newview/skins/default/xui/en/panel_places.xml @@ -40,26 +40,14 @@ background_visible="true" top_pad="10" width="313" /> <panel - class="panel_place_profile" - filename="panel_place_profile.xml" + class="panel_place_info" + filename="panel_place_info.xml" follows="all" height="533" layout="topleft" left="0" help_topic="places_info_tab" - name="panel_place_profile" - top="5" - visible="false" - width="313" /> - <panel - class="panel_landmark_info" - filename="panel_landmark_info.xml" - follows="all" - height="533" - layout="topleft" - left="0" - help_topic="places_info_tab" - name="panel_landmark_info" + name="panel_place_info" top="5" visible="false" width="313" /> diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml index c3a92f9d9a..5af7d7d674 100644 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_profile.xml @@ -157,7 +157,7 @@ value="http://librarianavengers.org" width="280" word_wrap="false" - use_ellipses="true" + use_elipsis="true" /> <text follows="left|top" diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml index 4b2e901718..195b731531 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_view.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml @@ -36,7 +36,7 @@ text_color="white" top="0" value="(Loading...)" - use_ellipses="true" + use_elipsis="true" width="275" /> <text follows="top|left" diff --git a/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml b/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml index 6171be034f..ab4ad94089 100644 --- a/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml +++ b/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml @@ -15,14 +15,14 @@ image_disabled_selected="ComboButton_Disabled_Selected" /> <gesture_combo_box.drop_down_button name="Drop Down Button" label="" - halign="center" hover_glow_amount="0.15" font="SansSerif" scale_image="true" - image_unselected="PushButton_Off" - image_selected="PushButton_Selected" - image_disabled="PushButton_Disabled" - image_disabled_selected="PushButton_Selected_Disabled" /> + pad_right="24" + image_unselected="DropDown_Off" + image_selected="DropDown_Selected" + image_disabled="DropDown_Disabled" + image_disabled_selected="DropDown_Disabled_Selected" /> <gesture_combo_box.combo_list bg_writeable_color="MenuDefaultBgColor" scroll_bar_bg_visible="true" /> <gesture_combo_box.combo_editor name="Combo Text Entry" diff --git a/indra/newview/skins/default/xui/en/widgets/talk_button.xml b/indra/newview/skins/default/xui/en/widgets/talk_button.xml deleted file mode 100644 index 725492052c..0000000000 --- a/indra/newview/skins/default/xui/en/widgets/talk_button.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<!-- Derives from LLUICtrl --> -<talk_button> - <!-- To make speak button look green when selected set: - image_selected="SegmentedBtn_Left_Selected" - image_unselected="SegmentedBtn_Left_Off" - --> - <speak_button - name="left" - label="Speak" - label_selected="Speak" - font="SansSerifSmall" - tab_stop="false" - is_toggle="true" - picture_style="true" - /> - <show_button - name="right" - label="" - left="0" - top="0" - right="20" - bottom="0" - tab_stop="false" - is_toggle="true" - picture_style="true" - image_selected="ComboButton_Selected" - image_unselected="ComboButton_Off" - /> - <monitor - name="monitor" - left="0" - top="18" - right="18" - bottom="0" - /> -</talk_button> |