diff options
Diffstat (limited to 'indra/newview/skins/default/xui')
6 files changed, 25 insertions, 26 deletions
diff --git a/indra/newview/skins/default/xui/de/panel_bottomtray.xml b/indra/newview/skins/default/xui/de/panel_bottomtray.xml index d3f89b0ad3..d52b8dcf4d 100644 --- a/indra/newview/skins/default/xui/de/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/de/panel_bottomtray.xml @@ -9,7 +9,7 @@ <layout_stack name="toolbar_stack"> <layout_panel name="speak_panel"> <talk_button name="talk"> - <speak_button label="Sprechen" label_selected="Sprechen" name="speak_btn"/> + <speak_button label="Sprechen" label_selected="Sprechen" name="speak_btn" halign="right" /> </talk_button> </layout_panel> <layout_panel name="gesture_panel"> diff --git a/indra/newview/skins/default/xui/en/menu_profile_overflow.xml b/indra/newview/skins/default/xui/en/menu_profile_overflow.xml index 5162a4902f..b0b7b554b0 100644 --- a/indra/newview/skins/default/xui/en/menu_profile_overflow.xml +++ b/indra/newview/skins/default/xui/en/menu_profile_overflow.xml @@ -6,6 +6,15 @@ name="profile_overflow_menu" width="120"> <menu_item_call + label="Map" + layout="topleft" + name="show_on_map"> + <menu_item_call.on_click + function="Profile.ShowOnMap" /> + <menu_item_call.on_enable + function="Profile.EnableShowOnMap" /> + </menu_item_call> + <menu_item_call label="Pay" layout="topleft" name="pay"> diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index e70a0512d6..58c5c11e51 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -74,12 +74,15 @@ name="talk" top="5" width="105"> + <!-- do not remove halign attribute with default value. otherwise it can't be overridden in other locales. + & pad_right is default value for long label which can be right aligned. See EXT-6318 --> <speak_button - halign="left" + halign="center" name="speak_btn" label="Speak" label_selected="Speak" - pad_left="12" + pad_right="22" + use_ellipses="true" /> <show_button> <show_button.init_callback diff --git a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml index 6b5f0c3896..6bf00373ea 100644 --- a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel follows="left|right|top|bottom" - name="MediaControlsPanel" + name="MediaControls" background_visible="false" height="200" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml index 9fcabc7722..30191aecb6 100644 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_profile.xml @@ -311,7 +311,7 @@ height="23" label="Add Friend" layout="topleft" - left="1" + left="2" mouse_opaque="false" name="add_friend" pad_left="1" @@ -319,7 +319,7 @@ tool_tip="Offer friendship to the Resident" top="5" use_ellipses="true" - width="105" /> + width="117" /> <button follows="bottom|left" height="23" @@ -328,8 +328,8 @@ name="im" tool_tip="Open instant message session" top="5" - left_pad="0" - width="19" /> + left_pad="1" + width="21" /> <button follows="bottom|left" height="23" @@ -337,26 +337,12 @@ layout="topleft" name="call" tool_tip="Call this Resident" - left_pad="0" + left_pad="1" pad_left="1" pad_right="1" top="5" use_ellipses="true" - width="48" /> - <button - enabled="false" - follows="bottom|left" - height="23" - label="Map" - layout="topleft" - name="show_on_map_btn" - pad_left="1" - pad_right="1" - tool_tip="Show the Resident on the map" - top="5" - left_pad="0" - use_ellipses="true" - width="33" /> + width="51" /> <button follows="bottom|left" height="23" @@ -364,12 +350,12 @@ layout="topleft" name="teleport" tool_tip="Offer teleport" - left_pad="0" + left_pad="1" pad_left="1" pad_right="1" top="5" use_ellipses="true" - width="81" /> + width="92" /> <button follows="bottom|right" height="23" 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 ef885e8045..aa3ea736b8 100644 --- a/indra/newview/skins/default/xui/en/widgets/chat_history.xml +++ b/indra/newview/skins/default/xui/en/widgets/chat_history.xml @@ -2,6 +2,7 @@ <chat_history message_header="panel_chat_header.xml" message_separator="panel_chat_separator.xml" + message_plaintext_separator="panel_chat_plaintext_separator.xml" left_text_pad="10" right_text_pad="15" left_widget_pad="0" |