diff options
Diffstat (limited to 'indra/newview/skins/default/xui/en')
38 files changed, 171 insertions, 121 deletions
diff --git a/indra/newview/skins/default/xui/en/alert_button.xml b/indra/newview/skins/default/xui/en/alert_button.xml index 48c67a3770..632564d793 100644 --- a/indra/newview/skins/default/xui/en/alert_button.xml +++ b/indra/newview/skins/default/xui/en/alert_button.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <button + name="Alert Button" label_shadow="true" auto_resize="false" image_overlay_alignment="center" diff --git a/indra/newview/skins/default/xui/en/favorites_bar_button.xml b/indra/newview/skins/default/xui/en/favorites_bar_button.xml index dfb0695ec3..6adf2a5950 100644 --- a/indra/newview/skins/default/xui/en/favorites_bar_button.xml +++ b/indra/newview/skins/default/xui/en/favorites_bar_button.xml @@ -3,7 +3,6 @@ <!-- All buttons in the Favorites bar will be created from this one --> <button follows="left|bottom" - font_halign="center" halign="center" height="15" image_disabled="transparent.j2c" diff --git a/indra/newview/skins/default/xui/en/floater_aaa.xml b/indra/newview/skins/default/xui/en/floater_aaa.xml index cb4cbd229a..0b48ba9321 100644 --- a/indra/newview/skins/default/xui/en/floater_aaa.xml +++ b/indra/newview/skins/default/xui/en/floater_aaa.xml @@ -18,7 +18,7 @@ single_instance="true" width="320"> <string name="nudge_parabuild">Nudge 1</string> - <string name="test_the_vlt">This string is extracted.</string> + <string name="test_the_vlt">This string CHANGE is extracted.</string> <chat_history allow_html="true" bg_readonly_color="ChatHistoryBgColor" 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 c58c1f00b9..61ca783d14 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -1871,13 +1871,14 @@ Only large parcels can be listed in search. layout="topleft" left="110" name="parcel_enable_voice_channel_is_estate_disabled" + top_delta="0" width="300" /> <check_box height="16" label="Restrict Voice to this parcel" layout="topleft" left="110" - name="parcel_enable_voice_channel_parcel" + name="parcel_enable_voice_channel_local" width="300" /> </panel> <panel diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency.xml b/indra/newview/skins/default/xui/en/floater_buy_currency.xml index d202bf1b9f..8f67f564a2 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_currency.xml @@ -304,7 +304,7 @@ Re-enter amount to see the latest exchange rate. </text> <text type="string" - width="175" + width="176" height="125" top="60" left="165" 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 d97ca554b7..1d51d19a4a 100644 --- a/indra/newview/skins/default/xui/en/floater_im_container.xml +++ b/indra/newview/skins/default/xui/en/floater_im_container.xml @@ -1,36 +1,36 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<multi_floater
- can_minimize="false"
- can_resize="true"
- height="390"
- layout="topleft"
- name="floater_im_box"
- help_topic="floater_im_box"
- save_rect="true"
- save_visibility="true"
- single_instance="true"
- title="CONVERSATIONS"
- width="392">
- <tab_container
- follows="left|right|top|bottom"
- height="390"
- layout="topleft"
- left="1"
- name="im_box_tab_container"
- tab_position="bottom"
- tab_width="80"
- tab_height="16"
- top="0"
- width="390" />
- <icon
- color="DefaultShadowLight"
- enabled="false"
- follows="left|right|bottom"
- height="17"
- image_name="tabarea.tga"
- layout="bottomleft"
- left="1"
- name="im_box_tab_container_icon"
- bottom="10"
- width="390" />
-</multi_floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<multi_floater + can_minimize="false" + can_resize="true" + height="390" + layout="topleft" + name="floater_im_box" + help_topic="floater_im_box" + save_rect="true" + save_visibility="true" + single_instance="true" + title="CONVERSATIONS" + width="392"> + <tab_container + follows="left|right|top|bottom" + height="390" + layout="topleft" + left="1" + name="im_box_tab_container" + tab_position="bottom" + tab_width="80" + tab_height="16" + top="0" + width="390" /> + <icon + color="DefaultShadowLight" + enabled="false" + follows="left|right|bottom" + height="17" + image_name="tabarea.tga" + layout="bottomleft" + left="1" + name="im_box_tab_container_icon" + bottom="10" + width="390" /> +</multi_floater> diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml index 243b63db00..613530b7aa 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -17,6 +17,7 @@ min_width="250" min_height="190"> <layout_stack + animate="false" follows="all" height="320" width="360" diff --git a/indra/newview/skins/default/xui/en/floater_media_browser.xml b/indra/newview/skins/default/xui/en/floater_media_browser.xml index 4b280ac59f..70dac7e41c 100644 --- a/indra/newview/skins/default/xui/en/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/en/floater_media_browser.xml @@ -80,7 +80,7 @@ height="20" layout="topleft" left_pad="5" - max_chars="255" + max_chars="1024" name="address" top_delta="0" width="540"> 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 ae198d69a3..f473a51ff6 100644 --- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml @@ -3,9 +3,9 @@ can_resize="true" can_minimize="true" can_close="false" - height="275" + height="202" layout="topleft" - min_height="100" + min_height="124" min_width="190" name="floater_voice_controls" help_topic="floater_voice_controls" @@ -36,7 +36,7 @@ <layout_stack clip="false" follows="all" - height="262" + height="189" layout="topleft" left="10" mouse_opaque="false" @@ -105,13 +105,13 @@ layout="topleft" left="2" top_pad="0" - height="205" + height="132" name="callers_panel" user_resize="false" width="280"> <avatar_list follows="all" - height="205" + height="132" ignore_online_status="true" layout="topleft" multi_select="true" 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 8904d4f49c..65c9c2a8fa 100644 --- a/indra/newview/skins/default/xui/en/floater_world_map.xml +++ b/indra/newview/skins/default/xui/en/floater_world_map.xml @@ -77,7 +77,7 @@ top_delta="6" left_pad="5" layout="topleft" - name="person_label" + name="me_label" width="90"> Me </text> @@ -196,7 +196,7 @@ height="16" layout="topleft" left_pad="0" - name="auction_label" + name="by_owner_label" top_delta="3" width="100"> by owner diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml index a666b8a427..9796f7b5b6 100644 --- a/indra/newview/skins/default/xui/en/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml @@ -58,8 +58,10 @@ height="35" left="8" name="user_details" + right="-10" word_wrap="true" top_pad="6" + use_ellipses="true" width="220">This is my second life description and I really think it is great. </text> <slider diff --git a/indra/newview/skins/default/xui/en/menu_participant_list.xml b/indra/newview/skins/default/xui/en/menu_participant_list.xml index 31263fbea8..805ffbae66 100644 --- a/indra/newview/skins/default/xui/en/menu_participant_list.xml +++ b/indra/newview/skins/default/xui/en/menu_participant_list.xml @@ -47,6 +47,9 @@ name="IM"> <menu_item_call.on_click function="Avatar.IM" /> + <menu_item_call.on_enable + function="ParticipantList.EnableItem" + parameter="can_im" /> </menu_item_call> <menu_item_call label="Call" @@ -65,6 +68,9 @@ name="Share"> <menu_item_call.on_click function="Avatar.Share" /> + <menu_item_call.on_enable + function="ParticipantList.EnableItem" + parameter="can_share" /> </menu_item_call> <menu_item_call label="Pay" diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 45100eb1ff..a98a049c17 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -293,7 +293,7 @@ create_jump_keys="true" label="Show" layout="topleft" - name="Land" + name="LandShow" tear_off="true"> <menu_item_check label="Move Controls" @@ -1603,17 +1603,6 @@ function="ToggleControl" parameter="MouseSmooth" /> </menu_item_check> - <menu_item_check - label="Show IMs in Nearby Chat" - layout="topleft" - name="IMInChat"> - <menu_item_check.on_check - function="CheckControl" - parameter="IMInChat" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="IMInChat" /> - </menu_item_check> <menu_item_separator layout="topleft" /> <menu diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 0768706223..960da7a274 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -770,6 +770,16 @@ Save changes to classified [NAME]? notext="Don't Save" yestext="Save"/> </notification> + + <notification + icon="alertmodal.tga" + name="ClassifiedInsufficientFunds" + type="alertmodal"> +Insufficient funds to create classified. + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> <notification icon="alertmodal.tga" @@ -1402,6 +1412,16 @@ You have added "[LANDMARK_NAME]" to your [FOLDER_NAME] folder. </notification> <notification + icon="alert.tga" + name="LandmarkAlreadyExists" + type="alert"> +You already have a landmark for this location. + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification icon="alertmodal.tga" name="CannotCreateLandmarkNotOwner" type="alertmodal"> diff --git a/indra/newview/skins/default/xui/en/panel_chat_separator.xml b/indra/newview/skins/default/xui/en/panel_chat_separator.xml index d0a2ddb289..357dbc07cc 100644 --- a/indra/newview/skins/default/xui/en/panel_chat_separator.xml +++ b/indra/newview/skins/default/xui/en/panel_chat_separator.xml @@ -3,6 +3,6 @@ background_visible="true" bg_alpha_color="black" follows="left|right|top" - height="1" + height="0" layout="topleft" name="chat_separator_panel" /> diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml index 15eff4b67c..8e39697a16 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml @@ -61,6 +61,7 @@ height="197" width="280" layout="topleft" + no_commit_on_selection="true" top="20" left="10" name="pick_snapshot" /> diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml index 172cf18fc4..8268937e7f 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml @@ -304,8 +304,10 @@ <name_box follows="left|top|right" height="30" + initial_value="(retrieving)" layout="topleft" left="0" + link="true" name="partner_text" top="0" width="285" 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 8188048821..673052c3b5 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 @@ -88,6 +88,7 @@ background_visible="true" initial_value="(retrieving)" layout="topleft" left_delta="0" + link="true" name="founder_name" top_pad="2" use_ellipses="true" @@ -150,7 +151,6 @@ background_visible="true" filename="panel_group_roles.xml" layout="topleft" left="0" - help_topic="group_roles_tab" name="group_roles_tab_panel" top="0" /> </accordion_tab> @@ -180,7 +180,6 @@ background_visible="true" filename="panel_group_land_money.xml" layout="topleft" left="0" - help_topic="group_land_money_tab" name="group_land_tab_panel" top="0" /> </accordion_tab> @@ -240,4 +239,4 @@ background_visible="true" right="-10" width="85" /> </panel> -</panel>
\ No newline at end of file +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml index 27c1af1860..34cde61252 100644 --- a/indra/newview/skins/default/xui/en/panel_my_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml @@ -51,6 +51,7 @@ top="0" left="0" height="505" + user_resize="false" width="313"> <scroll_container color="DkGray2" @@ -267,6 +268,7 @@ <name_box follows="left|top" height="10" + initial_value="(retrieving)" layout="topleft" left="0" link="true" @@ -364,6 +366,7 @@ top_pad="0" name="profile_me_buttons_panel" visible="false" + user_resize="false" auto_resize="false" height="28" width="313"> diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml index c3776e6a18..baa6c2e51f 100644 --- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml @@ -126,6 +126,12 @@ <combo_editor label="Search [SECOND_LIFE]" name="search_combo_editor"/> + <combo_list + draw_border="true" + border.highlight_light_color="FocusColor" + border.highlight_dark_color="FocusColor" + border.shadow_light_color="FocusColor" + border.shadow_dark_color="FocusColor"/> </search_combo_box> </panel> <favorites_bar diff --git a/indra/newview/skins/default/xui/en/panel_notes.xml b/indra/newview/skins/default/xui/en/panel_notes.xml index 45b64d5e26..ac100a2c06 100644 --- a/indra/newview/skins/default/xui/en/panel_notes.xml +++ b/indra/newview/skins/default/xui/en/panel_notes.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel follows="all" - height="535" + height="540" label="Notes & Privacy" layout="topleft" left="0" diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml index fd540bdc7e..8895484326 100644 --- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml @@ -21,22 +21,8 @@ halign="center" width="313"> <inventory_panel - follows="all" - background_visible="true" - background_opaque="true" - label="WEARING" - help_topic="now_wearing_tab" - allow_multi_select="true" - border="false" - left="0" - top="0" - mouse_opaque="true" - name="cof_accordionpanel" - start_folder="Current Outfit" - width="313" /> - <inventory_panel - background_visible="true" - background_opaque="true" + background_visible="true" + background_opaque="true" label="MY OUTFITS" help_topic="my_outfits_tab" allow_multi_select="true" @@ -48,6 +34,20 @@ mouse_opaque="true" name="outfitslist_tab" start_folder="My Outfits" /> + <inventory_panel + follows="all" + background_visible="true" + background_opaque="true" + label="WEARING" + help_topic="now_wearing_tab" + allow_multi_select="true" + border="false" + left="0" + top="0" + mouse_opaque="true" + name="cof_accordionpanel" + start_folder="Current Outfit" + width="313" /> </tab_container> <panel background_visible="true" @@ -103,5 +103,15 @@ top="26" tool_tip="Wear selected outfit" width="120" /> + <button + follows="bottom|left" + height="23" + label="M" + layout="topleft" + right="-140" + name="look_edit_btn" + top="26" + visible="false" + width="20" /> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index 8a02637817..da3a2274c9 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -3,7 +3,7 @@ <panel background_visible="true" follows="all" - height="570" + height="575" label="People" layout="topleft" min_height="350" @@ -337,7 +337,7 @@ background_visible="true" </tab_container> <panel follows="bottom|left" - height="25" + height="35" layout="topleft" left="10" name="button_bar" 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 822e049eec..65ccd10cf0 100644 --- a/indra/newview/skins/default/xui/en/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml @@ -39,7 +39,7 @@ height="500" layout="topleft" left="10" - top_pad="10" + top_pad="5" name="profile_scroll" width="313"> <panel @@ -102,7 +102,7 @@ </scroll_container> <panel follows="left|right|bottom" - height="20" + height="35" layout="topleft" top_pad="8" left="10" diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml index a2b0adf9d9..d31f4d039f 100644 --- a/indra/newview/skins/default/xui/en/panel_picks.xml +++ b/indra/newview/skins/default/xui/en/panel_picks.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel follows="all" - height="535" + height="540" label="Picks" layout="topleft" left="0" @@ -121,7 +121,7 @@ <panel layout="topleft" left="0" - height="25" + height="30" top_pad="10" name="buttons_cucks" width="313"> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml index 1e7acb566f..141678f7eb 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml @@ -34,7 +34,14 @@ name="background" tool_tip="Choose color for bubble chat" top_delta="1" - width="44" /> + width="44"> + <color_swatch.init_callback + function="Pref.getUIColor" + parameter="BackgroundChatColor" /> + <color_swatch.commit_callback + function="Pref.applyUIColor" + parameter="BackgroundChatColor" /> + </color_swatch> <slider control_name="ChatBubbleOpacity" follows="left|top" diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml index 4ac7295a7f..7c584ba2c8 100644 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_profile.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel follows="all" - height="535" + height="540" label="Profile" layout="topleft" left="0" @@ -248,6 +248,7 @@ <name_box follows="left|top" height="10" + initial_value="(retrieving)" layout="topleft" left="0" link="true" @@ -284,7 +285,7 @@ </layout_panel> <layout_panel follows="bottom|left" - height="28" + height="30" layout="topleft" name="profile_buttons_panel" auto_resize="false" @@ -355,7 +356,7 @@ </layout_panel> <layout_panel follows="bottom|left" - height="28" + height="30" layout="topleft" name="profile_me_buttons_panel" visible="false" @@ -364,7 +365,7 @@ follows="bottom|right" height="23" left="20" - top="0" + top="0" label="Edit Profile" name="edit_profile_btn" tool_tip="Edit your personal information" 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 c51447eaf0..d46e1f9852 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_view.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml @@ -60,7 +60,7 @@ tab_min_width="80" tab_height="30" tab_position="top" - top_pad="10" + top_pad="5" width="313"> <panel class="panel_profile" diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml index bfca2f2e46..7a6089c74e 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -53,7 +53,7 @@ label_shadow="false" name="buycurrency" tool_tip="My Balance" - top="5" + top="3" width="100" /> <button auto_resize="true" @@ -71,7 +71,7 @@ name="buyL" pad_right="20px" tool_tip="Click to buy more L$" - top="5" + top="2" width="100" /> <text type="string" @@ -80,7 +80,7 @@ follows="right|bottom" halign="right" height="16" - top="7" + top="5" layout="topleft" left_pad="0" name="TimeText" @@ -96,7 +96,7 @@ image_unselected="Audio_Off" is_toggle="true" left_pad="18" - top="4" + top="2" name="volume_btn" tool_tip="Global Volume Control" width="16" /> diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml index ba2d61afb7..d198237e5d 100644 --- a/indra/newview/skins/default/xui/en/panel_toast.xml +++ b/indra/newview/skins/default/xui/en/panel_toast.xml @@ -39,7 +39,8 @@ name="toast_text" word_wrap="true" text_color="white" - top="5" + top="5" + v_pad="5" use_ellipses="true" width="260"> Toast text; diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 02dc507781..b378944e48 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2170,7 +2170,7 @@ this texture in your inventory Unknown file extension .%s Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh </string> - <string name="MuteObject">Block</string> + <string name="MuteObject2">Block</string> <string name="MuteAvatar">Block</string> <string name="UnmuteObject">Unblock</string> <string name="UnmuteAvatar">Unblock</string> 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 f6d1992c8e..ef885e8045 100644 --- a/indra/newview/skins/default/xui/en/widgets/chat_history.xml +++ b/indra/newview/skins/default/xui/en/widgets/chat_history.xml @@ -6,8 +6,8 @@ right_text_pad="15" left_widget_pad="0" right_widget_pad="10" - top_separator_pad="2" - bottom_separator_pad="2" + top_separator_pad="1" + bottom_separator_pad="1" top_header_pad="12" bottom_header_pad="5" max_length="2147483647" @@ -21,5 +21,4 @@ mouse_opaque="true" word_wrap="true" /> -</chat_history> -enabledcontrol
\ No newline at end of file +</chat_history>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml index dcfaeb449b..63f08a4250 100644 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <chiclet_im_adhoc - height="25" + height="23" name="im_adhoc_chiclet" show_speaker="false" width="25"> @@ -14,7 +14,7 @@ <chiclet_im_adhoc.speaker auto_update="true" draw_border="false" - height="25" + height="23" left="25" name="speaker" visible="false" @@ -28,13 +28,13 @@ name="adhoc_icon" width="21" /> <chiclet_im_adhoc.unread_notifications - font_halign="center" - height="25" + halign="center" + height="23" left="25" mouse_opaque="false" name="unread" text_color="white" - v_pad="5" + v_pad="3" visible="false" width="20" /> <chiclet_im_adhoc.new_message_icon diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml index de37b5b94e..372a89cbc7 100644 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <chiclet_im_group - height="25" + height="23" name="im_group_chiclet" show_speaker="false" width="25"> @@ -29,13 +29,13 @@ name="group_icon" width="21" /> <chiclet_im_group.unread_notifications - height="25" - font_halign="center" + height="23" + halign="center" left="25" mouse_opaque="false" name="unread" text_color="white" - v_pad="5" + v_pad="3" visible="false" width="20"/> <chiclet_im_group.new_message_icon diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml index 8233c4b488..99807d4717 100644 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <chiclet_im_p2p - height="25" + height="23" name="im_p2p_chiclet" show_speaker="false" width="25"> @@ -14,7 +14,7 @@ <chiclet_im_p2p.speaker auto_update="true" draw_border="false" - height="25" + height="23" left="25" name="speaker" visible="false" @@ -28,13 +28,13 @@ name="avatar_icon" width="21" /> <chiclet_im_p2p.unread_notifications - height="25" - font_halign="center" + height="23" + halign="center" left="25" mouse_opaque="false" name="unread" text_color="white" - v_pad="5" + v_pad="3" visible="false" width="20"/> <chiclet_im_p2p.new_message_icon diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml index 8918120918..4bc295f747 100644 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <chiclet_offer - height="25" + height="23" name="offer_chiclet" width="25"> <chiclet_offer.chiclet_button 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 8e3541231d..db6a9434df 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,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <chiclet_script - height="25" + height="23" name="script_chiclet" width="25"> <chiclet_script.chiclet_button @@ -13,7 +13,7 @@ <chiclet_script.icon bottom="3" follows="all" - height="20" + height="18" image_name="Generic_Object_Small" left="2" mouse_opaque="false" diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml index 4520768216..63166f32b7 100644 --- a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml +++ b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml @@ -15,4 +15,6 @@ background_visible="true" heading_height="23" draw_border="false" - draw_heading="false" /> + draw_heading="false" + border.name="dig border" + border.bevel_style="in" /> |