diff options
Diffstat (limited to 'indra/newview/skins/default/xui/en')
5 files changed, 74 insertions, 59 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 613530b7aa..d2e5473157 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -11,7 +11,7 @@ can_dock="false" can_minimize="true" can_close="true" - visible="true" + visible="false" width="360" can_resize="true" min_width="250" 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 f473a51ff6..c4411db8c5 100644 --- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml @@ -56,7 +56,7 @@ height="18" default_icon_name="Generic_Person" layout="topleft" - left="0" + left="5" name="user_icon" top="0" width="18" /> @@ -78,6 +78,7 @@ follows="top|right" height="16" layout="topleft" + right="-3" name="speaking_indicator" left_pad="5" visible="true" diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 960da7a274..41f4621d66 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -244,6 +244,16 @@ Save all changes to clothing/body parts? <notification icon="alertmodal.tga" + name="FriendsAndGroupsOnly" + type="alertmodal"> + Non-friends won't know that you've choosen to ignore their calls and instant messages. + <usetemplate + name="okbutton" + yestext="Yes"/> + </notification> + + <notification + icon="alertmodal.tga" name="GrantModifyRights" type="alertmodal"> Granting modify rights to another Resident allows them to change, delete or take ANY objects you may have in-world. Be VERY careful when handing out this permission. diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml index 615ade99a2..c605975c8e 100644 --- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml @@ -65,28 +65,18 @@ height="15" layout="topleft" left_pad="5" + right="-72" name="last_interaction" text_color="LtGray_50" value="0s" width="24" /> - <output_monitor - auto_update="true" - follows="right" - draw_border="false" - height="16" - layout="topleft" - left_pad="5" - mouse_opaque="true" - name="speaking_indicator" - visible="true" - width="20" /> <button follows="right" height="16" image_pressed="Info_Press" image_unselected="Info_Over" left_pad="3" - right="-31" + right="-53" name="info_btn" top_delta="-2" width="16" /> @@ -96,9 +86,21 @@ image_overlay="ForwardArrow_Off" layout="topleft" left_pad="5" - right="-3" + right="-28" name="profile_btn" tool_tip="View profile" top_delta="-2" width="20" /> + <output_monitor + auto_update="true" + follows="right" + draw_border="false" + height="16" + layout="topleft" + left_pad="5" + right="-3" + mouse_opaque="true" + name="speaking_indicator" + visible="true" + width="20" /> </panel> 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 2075d7e05b..db156f7877 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 @@ -2,7 +2,7 @@ <panel border="false" follows="all" - height="380" + height="420" label="Land & L$" layout="topleft" left="0" @@ -237,7 +237,7 @@ </text> <tab_container follows="all" - height="173" + height="180" halign="center" layout="topleft" left="0" @@ -250,7 +250,7 @@ <panel border="false" follows="all" - height="173" + height="180" label="PLANNING" layout="topleft" left="0" @@ -275,7 +275,7 @@ <panel border="false" follows="all" - height="173" + height="180" label="DETAILS" layout="topleft" left="0" @@ -296,41 +296,44 @@ word_wrap="true"> Loading... </text_editor> + + <button + height="20" + image_overlay="Arrow_Left_Off" + layout="topleft" + left="5" + name="earlier_details_button" + tool_tip="Go back in time" + top_pad="10" + width="25" /> <button - follows="left|top" - height="18" - image_overlay="Arrow_Left_Off" - layout="topleft" - name="earlier_details_button" - tool_tip="Back" - right="-45" - bottom="0" - width="25" /> - <button - follows="left|top" - height="18" - image_overlay="Arrow_Right_Off" - layout="topleft" - left_pad="10" - name="later_details_button" - tool_tip="Next" - width="25" /> - </panel> + height="20" + image_overlay="Arrow_Right_Off" + layout="topleft" + left_pad="5" + name="later_details_button" + tool_tip="Go forward in time" + top_delta="0" + width="25" /> + + + </panel> <panel border="false" follows="all" - height="173" + height="180" label="SALES" layout="topleft" left_delta="0" help_topic="group_money_sales_tab" + mouse_opaque="false" name="group_money_sales_tab" top="0" width="300"> <text_editor type="string" follows="all" - height="140" + height="130" layout="topleft" left="0" max_length="4096" @@ -340,25 +343,24 @@ word_wrap="true"> Loading... </text_editor> - <button - bottom="0" - follows="left|top" - height="18" - image_overlay="Arrow_Left_Off" - layout="topleft" - name="earlier_sales_button" - tool_tip="Back" - right="-45" - width="25" /> - <button - follows="left|top" - height="18" - image_overlay="Arrow_Right_Off" - layout="topleft" - left_pad="10" - name="later_sales_button" - tool_tip="Next" - width="25" /> + <button + height="20" + image_overlay="Arrow_Left_Off" + layout="topleft" + left="5" + name="earlier_sales_button" + tool_tip="Go back in time" + top_pad="10" + width="25" /> + <button + height="20" + image_overlay="Arrow_Right_Off" + layout="topleft" + left_pad="5" + name="later_sales_button" + tool_tip="Go forward in time" + top_delta="0" + width="25" /> </panel> </tab_container> </panel> |