diff options
Diffstat (limited to 'indra/newview/skins/default/xui')
11 files changed, 36 insertions, 20 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_gesture.xml b/indra/newview/skins/default/xui/en/floater_gesture.xml index a3ac878202..21d292847a 100644 --- a/indra/newview/skins/default/xui/en/floater_gesture.xml +++ b/indra/newview/skins/default/xui/en/floater_gesture.xml @@ -83,7 +83,20 @@ tool_tip="Make new gesture" top_delta="0" width="18" /> - <button + <button + follows="bottom|left" + font="SansSerifBigBold" + height="10" + image_hover_selected="Activate_Checkmark" + image_selected="Activate_Checkmark" + image_unselected="Activate_Checkmark" + layout="topleft" + left_pad="5" + name="activate_btn" + tool_tip="Activate/Deactivate selected gesture" + top="10" + width="10" /> + <button follows="bottom|right" font="SansSerifBigBold" height="18" 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 452d28d4ea..70d708f0e7 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -9,6 +9,7 @@ name="panel_im" help_topic="panel_im" top="0" + can_close="false" can_dock="true" can_minimize="true" visible="true" 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 7f58ea132e..84e549f773 100644 --- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml +++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml @@ -3,7 +3,7 @@ legacy_header_height="18" can_minimize="true" can_tear_off="false" - can_resize="false" + can_resize="true" can_drag_on_left="false" can_close="false" can_dock="true" diff --git a/indra/newview/skins/default/xui/en/floater_sys_well.xml b/indra/newview/skins/default/xui/en/floater_sys_well.xml index e1f07a49e7..be6d63716c 100644 --- a/indra/newview/skins/default/xui/en/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/en/floater_sys_well.xml @@ -15,7 +15,7 @@ height="23" can_minimize="true" can_tear_off="false" - can_resize="false" + can_resize="true" can_drag_on_left="false" can_close="false" can_dock="true" diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml index 9e35c95d45..14a4949df7 100644 --- a/indra/newview/skins/default/xui/en/main_view.xml +++ b/indra/newview/skins/default/xui/en/main_view.xml @@ -10,7 +10,7 @@ <layout_stack border_size="0" follows="all" mouse_opaque="false" - height="772" + height="768" name="menu_stack" orientation="vertical" top="0"> 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 590621062c..a731996a1a 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 @@ -17,6 +17,8 @@ name="add_friend">
<menu_item_call.on_click
function="InspectAvatar.AddFriend"/>
+ <menu_item_call.on_enable
+ function="InspectAvatar.Gear.Enable"/>
</menu_item_call>
<menu_item_call
label="IM"
diff --git a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml index 5c8a8ee208..3842c2a8db 100644 --- a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml @@ -61,6 +61,7 @@ layout="topleft" left_delta="0" name="Block object by name..." + tool_tip="Pick an object to block by name" top_pad="4" width="210" > <button.commit_callback diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index a902f50582..d2933c0c0e 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -94,7 +94,7 @@ min_height="28" width="82" top_delta="0" - min_width="82" + min_width="52" name="gesture_panel" user_resize="false"> <gesture_combo_box @@ -105,9 +105,13 @@ name="Gesture" left="0" top="3" - use_ellipses="true" width="82" - tool_tip="Shows/hides gestures"/> + tool_tip="Shows/hides gestures"> + <gesture_combo_box.drop_down_button + font="SansSerifSmall" + pad_right="10" + use_ellipses="true" /> + </gesture_combo_box> </layout_panel> <icon auto_resize="false" @@ -131,7 +135,7 @@ name="movement_panel" user_resize="false" width="80" - min_width="80"> + min_width="49"> <button follows="left|right" height="23" @@ -167,7 +171,7 @@ height="28" layout="topleft" min_height="28" - min_width="80" + min_width="49" name="cam_panel" user_resize="false" width="80"> diff --git a/indra/newview/skins/default/xui/en/panel_chat_item.xml b/indra/newview/skins/default/xui/en/panel_chat_item.xml index 05b04bbf8e..d8a0c877fd 100644 --- a/indra/newview/skins/default/xui/en/panel_chat_item.xml +++ b/indra/newview/skins/default/xui/en/panel_chat_item.xml @@ -15,19 +15,13 @@ color="1 1 1 1" enabled="true" name="avatar_icon" /> <text - width="130" top="25" left="40" height="20" follows="left|right|top" + width="150" top="25" left="40" height="20" follows="left|right|top" font="SansSerifBigBold" text_color="white" word_wrap="false" use_ellipses="true" mouse_opaque="true" name="sender_name" > Jerry Knight </text> - <icon top="22" left="170" width="15" height="15" follows="top|right" + <icon top="22" left="215" width="15" height="15" follows="top|right" image_name="icn_voice-pvtfocus.tga" visible="false" name="msg_inspector"/> - <icon top="22" left="190" width="10" height="10" follows="top|right" - image_name="speaking_indicator.tga" name="msg_icon"/> - <text width="35" top="22" left="205" height="20" follows="right|top" - text_color="white" word_wrap="true" mouse_opaque="true" name="msg_time" > - 10:32 - </text> </panel> <text_chat top="-35" left="10" right="-10" height="120" follows="left|right|bottom" diff --git a/indra/newview/skins/default/xui/en/panel_group_notify.xml b/indra/newview/skins/default/xui/en/panel_group_notify.xml index 984a799b41..e699a77581 100644 --- a/indra/newview/skins/default/xui/en/panel_group_notify.xml +++ b/indra/newview/skins/default/xui/en/panel_group_notify.xml @@ -104,7 +104,8 @@ name="attachment"
text_color="GroupNotifyTextColor"
value="Attachment"
- width="280" />
+ use_ellipses="true"
+ width="250" />
<button
bottom="130"
follows="bottom"
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 1f67a0a732..4ab6175805 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 @@ -26,7 +26,7 @@ name="selected_icon" top="0" visible="false" - width="320" /> + width="380" /> <icon height="16" follows="top|left" @@ -46,7 +46,7 @@ text_color="white" top="4" value="..." - width="242" /> + width="330" /> <button follows="right" height="20" |