diff options
Diffstat (limited to 'indra/newview/skins/default')
14 files changed, 152 insertions, 152 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_buy_contents.xml b/indra/newview/skins/default/xui/en/floater_buy_contents.xml index 833e8beb8d..77a0e9b91b 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_contents.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_contents.xml @@ -56,7 +56,7 @@ <text type="string" length="1" - follows="left|top" + follows="left|bottom" font="SansSerif" height="16" layout="topleft" @@ -68,7 +68,7 @@ Buy for L$[AMOUNT] from [NAME]? </text> <check_box - follows="left|top" + follows="left|bottom" height="16" label="Wear clothing now" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml index 4792a1a476..e972cf39bf 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -8,67 +8,71 @@ left="0" name="panel_im" top="0" - can_close="false" + can_close="true" can_dock="true" - can_minimize="false" + can_minimize="true" visible="true" - width="320" + width="350" can_resize="true" min_width="300" min_height="350"> - <layout_stack follows="all" - height="350" - width="300" - layout="topleft" - orientation="horizontal" - name="im_panels" - top="20" - left="0"> + <layout_stack + follows="all" + height="350" + width="300" + layout="topleft" + orientation="horizontal" + name="im_panels" + top="20" + left="0"> <layout_panel name="panel_im_control_panel" layout="topleft" - top_delta="-3" - height="350" follows="left" label="IM Control Panel" auto_resize="false" user_resize="false" /> - <layout_panel height="350" - width="" - left_delta="110" - top="0" - user_resize="false"> - <button height="20" - follows="left|top" - top="0" - image_overlay="TabIcon_Open_Off" - layout="topleft" - width="25" - name="slide_left_btn" /> - <button height="20" - follows="left|top" - top="0" - image_overlay="TabIcon_Close_Off" - width="25" - name="slide_right_btn" /> - <chat_history - length="1" - follows="all" - height="275" - layout="topleft" - name="chat_history" - parse_highlights="true" - allow_html="true" - width="160"> - </chat_history> - <line_editor - follows="left|right" - height="20" - label="To" - layout="topleft" - name="chat_editor" - width="160"> - </line_editor> + <layout_panel + left="0" + top="0" + user_resize="false"> + <button + height="20" + follows="left|top" + top="0" + left="2" + image_overlay="TabIcon_Open_Off" + layout="topleft" + width="25" + name="slide_left_btn" /> + <button + height="20" + follows="left|top" + top="0" + left="2" + image_overlay="TabIcon_Close_Off" + width="25" + name="slide_right_btn" /> + <chat_history + length="1" + font="SansSerifSmall" + follows="left|right|top" + height="280" + name="chat_history" + parse_highlights="true" + allow_html="true" + left="1" + width="180"> + </chat_history> + <line_editor + follows="left|right|top" + font="SansSerifSmall" + height="20" + label="To" + name="chat_editor" + top_pad="1" + width="180"> + </line_editor> </layout_panel> </layout_stack> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml index 69b015a727..d8534bfe0b 100644 --- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml +++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml @@ -5,7 +5,7 @@ can_tear_off="false" can_resize="true" can_drag_on_left="false" - can_close="false" + can_close="true" can_dock="true" bevel_style="in" height="300" diff --git a/indra/newview/skins/default/xui/en/floater_region_info.xml b/indra/newview/skins/default/xui/en/floater_region_info.xml index 9bb30f8e86..262bcd07a0 100644 --- a/indra/newview/skins/default/xui/en/floater_region_info.xml +++ b/indra/newview/skins/default/xui/en/floater_region_info.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater legacy_header_height="18" - height="512" + height="555" help_topic="regioninfo" layout="topleft" name="regioninfo" @@ -9,7 +9,7 @@ title="REGION/ESTATE" width="480"> <tab_container - bottom="512" + bottom="555" follows="left|right|top|bottom" layout="topleft" left="1" diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index a626e1b353..8b6f0f03fe 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -968,23 +968,27 @@ <combo_box.item label="Touch (default)" name="Touch/grab(default)" - value="Touch/grab (default)" /> + value="Touch" /> <combo_box.item label="Sit on object" name="Sitonobject" - value="Sit on object" /> + value="Sit" /> <combo_box.item label="Buy object" name="Buyobject" - value="Buy object" /> + value="Buy" /> <combo_box.item label="Pay object" name="Payobject" - value="Pay object" /> + value="Pay" /> <combo_box.item label="Open" name="Open" value="Open" /> + <combo_box.item + label="Zoom" + name="Zoom" + value="Zoom" /> </combo_box> <check_box height="16" diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index d2933c0c0e..00711a29e0 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -299,8 +299,8 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly. min_height="28" top="0" name="sys_well_panel" - width="34" - min_width="34" + width="54" + min_width="54" user_resize="false"> <chiclet_notification follows="right" @@ -309,22 +309,21 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly. left="0" name="sys_well" top="4" - width="34"> + width="54"> <button auto_resize="true" halign="right" height="23" follows="right" flash_color="EmphasisColor" + left="0" name="Unread" image_overlay="Notices_Unread" - width="20" + image_overlay_alignment="right" + pad_right="6" + pad_left="6" + width="54" /> - <unread_notifications - width="34" - height="20" - left="0" - top="19" /> </chiclet_notification> </layout_panel> <icon diff --git a/indra/newview/skins/default/xui/en/panel_chat_header.xml b/indra/newview/skins/default/xui/en/panel_chat_header.xml index 323ee957e7..7a3eae35a9 100644 --- a/indra/newview/skins/default/xui/en/panel_chat_header.xml +++ b/indra/newview/skins/default/xui/en/panel_chat_header.xml @@ -3,13 +3,13 @@ background_visible="true" bevel_style="in" bg_alpha_color="black" - follows="top" + follows="top|left|right" height="24" - label="im_header" - layout="topleft" - name="im_header" - width="300"> - <avatar_icon + label="im_header" + layout="topleft" + name="im_header" + width="300"> + <avatar_icon follows="left" height="18" image_name="Generic_Person" 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 9573904c93..73d843e6dd 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 @@ -38,28 +38,29 @@ label="Teleport" name="teleport_btn" width="100" /> - <button + <!-- <button follows="left|top" height="20" label="Share" name="share_btn" - width="100" /> - <button + width="100" />--> + <!--Removing pay button to save space - will update spec - verified by Erica/Steve --> + <!-- <button follows="left|top" height="20" label="Pay" name="pay_btn" - width="100" /> + width="100" />--> <panel background_visible="true" bg_alpha_color="DkGray2" border="false" - follows="left|top" + top_pad="10" + follows="left|bottom" height="70" - left="0" - left_pad="0" + left="1" name="panel_call_buttons" - width="110"> + width="109"> <button bottom="10" height="20" diff --git a/indra/newview/skins/default/xui/en/panel_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml index b01ddbf75a..a219e30b8b 100644 --- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml @@ -87,8 +87,8 @@ width="313"> <panel bg_alpha_color="DkGray2" - follows="all" - height="533" + follows="left|top|right" + height="610" layout="topleft" left="0" min_height="300" @@ -145,7 +145,7 @@ top_pad="10" width="18" /> <text - follows="right|top" + follows="left|top|right" height="16" layout="topleft" left_pad="8" diff --git a/indra/newview/skins/default/xui/en/panel_notification.xml b/indra/newview/skins/default/xui/en/panel_notification.xml index 462188ee24..df37f9973c 100644 --- a/indra/newview/skins/default/xui/en/panel_notification.xml +++ b/indra/newview/skins/default/xui/en/panel_notification.xml @@ -90,15 +90,4 @@ name="control_panel" top_pad="0"> </panel> - <!-- - <icon - follows="left|top" - height="32" - image_name="notify_tip_icon.tga" - layout="topleft" - left="8" - mouse_opaque="false" - name="info_icon" - top="20" - width="32" /> --> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml index e6084202d7..9ab5c6b4f7 100644 --- a/indra/newview/skins/default/xui/en/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml @@ -172,7 +172,7 @@ width="313"> <panel bg_alpha_color="DkGray2" - follows="all" + follows="left|top|right" height="533" layout="topleft" left="0" @@ -192,7 +192,7 @@ <layout_stack border_size="0" clip="false" - follows="all" + follows="left|top|right" height="50" layout="topleft" mouse_opaque="false" @@ -305,7 +305,7 @@ top_delta="0" width="18" /> <text - follows="right|top" + follows="left|top|right" height="16" layout="topleft" left_pad="8" diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml index add1476179..e25ff0d548 100644 --- a/indra/newview/skins/default/xui/en/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml @@ -81,7 +81,7 @@ regions in the estate. <view_border bevel_style="in" follows="top|left" - height="290" + height="310" layout="topleft" left_delta="-4" top_pad="5" @@ -185,48 +185,48 @@ regions in the estate. follows="left|top" height="20" layout="topleft" - left="10" + left="15" name="abuse_email_text" - top_pad="5" + top_pad="10" width="180"> Abuse email address: </text> <line_editor follows="top|left" - height="19" + height="23" layout="topleft" left="15" name="abuse_email_address" - top_pad="5" - width="205" /> + top_pad="-5" + width="230" /> <button enabled="false" follows="left|top" - height="20" + height="23" label="Apply" layout="topleft" name="apply_btn" - right="250" - top_pad="4" - width="90" /> + top_pad="10" + left="78" + width="97" /> <button follows="left|top" - height="20" + height="23" label="Send Message To Estate..." layout="topleft" - left="8" + left="50" name="message_estate_btn" - top_pad="5" - width="250" /> + top_pad="20" + width="160" /> <button follows="left|top" - height="20" + height="23" label="Kick User from Estate..." layout="topleft" - left="8" + left="50" name="kick_user_from_estate_btn" top_pad="5" - width="250" /> + width="160" /> <text type="string" @@ -243,14 +243,14 @@ regions in the estate. <view_border bevel_style="none" follows="top|left" - height="60" + height="71" layout="topleft" right="470" - top_pad="5" + top_pad="-5" width="200" /> <name_list follows="left|top" - height="60" + height="71" layout="topleft" left_delta="0" multi_select="true" @@ -259,22 +259,22 @@ regions in the estate. width="200" /> <button follows="left|top" - height="20" + height="23" label="Remove..." layout="topleft" name="remove_estate_manager_btn" right="470" top_pad="5" - width="90" /> + width="97" /> <button follows="left|top" - height="20" + height="23" label="Add..." layout="topleft" - left_delta="-110" + left_delta="-103" name="add_estate_manager_btn" top_delta="0" - width="90" /> + width="97" /> <text type="string" length="1" @@ -283,21 +283,21 @@ regions in the estate. layout="topleft" left_delta="0" name="allow_resident_label" - top_pad="5" + top_pad="10" width="200"> Allowed Residents: </text> <view_border bevel_style="none" follows="top|left" - height="60" + height="71" layout="topleft" right="470" - top_pad="5" + top_pad="-5" width="200" /> <name_list follows="left|top" - height="60" + height="71" layout="topleft" left_delta="0" multi_select="true" @@ -306,22 +306,22 @@ regions in the estate. width="200" /> <button follows="left|top" - height="20" + height="23" label="Remove..." layout="topleft" name="remove_allowed_avatar_btn" right="470" top_pad="5" - width="90" /> + width="97" /> <button follows="left|top" - height="20" + height="23" label="Add..." layout="topleft" - left_delta="-110" + left_delta="-103" name="add_allowed_avatar_btn" top_delta="0" - width="90" /> + width="97" /> <text type="string" length="1" @@ -330,21 +330,21 @@ regions in the estate. layout="topleft" left_delta="0" name="allow_group_label" - top_pad="5" + top_pad="10" width="200"> Allowed Groups: </text> <view_border bevel_style="none" follows="top|left" - height="60" + height="71" layout="topleft" right="470" - top_pad="5" + top_pad="-5" width="200" /> <name_list follows="left|top" - height="60" + height="71" layout="topleft" left_delta="0" multi_select="true" @@ -353,22 +353,22 @@ regions in the estate. width="200" /> <button follows="left|top" - height="20" + height="23" label="Remove..." layout="topleft" name="remove_allowed_group_btn" right="470" top_pad="5" - width="90" /> + width="97" /> <button follows="left|top" - height="20" + height="23" label="Add..." layout="topleft" - left_delta="-110" + left_delta="-103" name="add_allowed_group_btn" top_delta="0" - width="90" /> + width="97" /> <text type="string" length="1" @@ -377,21 +377,21 @@ regions in the estate. layout="topleft" left_delta="0" name="ban_resident_label" - top_pad="5" + top_pad="10" width="200"> Banned Residents: </text> <view_border bevel_style="none" follows="top|left" - height="60" + height="71" layout="topleft" right="470" - top_pad="5" + top_pad="-5" width="200" /> <name_list follows="left|top" - height="60" + height="71" layout="topleft" left_delta="0" multi_select="true" @@ -400,20 +400,20 @@ regions in the estate. width="200" /> <button follows="left|top" - height="20" + height="23" label="Remove..." layout="topleft" name="remove_banned_avatar_btn" right="470" top_pad="5" - width="90" /> + width="97" /> <button follows="left|top" - height="20" + height="23" label="Add..." layout="topleft" - left_delta="-110" + left_delta="-103" name="add_banned_avatar_btn" top_delta="0" - width="90" /> + width="97" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml index 4ab6175805..3384852f27 100644 --- a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml @@ -18,7 +18,7 @@ visible="false" width="380" /> <icon - height="24" + height="20" follows="top|right|left" image_name="ListItem_Select" layout="topleft" @@ -55,7 +55,7 @@ left_pad="5" right="-3" name="profile_btn" - top_delta="-2" + top="1" visible="false" width="20" /> </panel> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index a5272d1883..e76763d7eb 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2868,6 +2868,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="inventory_item_offered-im"> Inventory item offered </string> + <string name="share_alert"> + Drag items from inventory here + </string> <string name="only_user_message"> You are the only user in this session. |