diff options
Diffstat (limited to 'indra/newview/skins/default')
3 files changed, 49 insertions, 8 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_profile_other.xml b/indra/newview/skins/default/xui/en/menu_profile_other.xml index 7731ee65d1..fff1f7b614 100644 --- a/indra/newview/skins/default/xui/en/menu_profile_other.xml +++ b/indra/newview/skins/default/xui/en/menu_profile_other.xml @@ -128,6 +128,17 @@ </menu_item_check> <menu_item_separator name="separator_copy_options"/> <menu_item_call + label="Permissions" + layout="topleft" + name="agent_permissions"> + <menu_item_call.on_click + function="Profile.Commit" + parameter="agent_permissions"/> + <menu_item_call.on_visible + function="Profile.EnableItem" + parameter="agent_permissions"/> + </menu_item_call> + <menu_item_call label="Copy Display Name" layout="topleft" name="copy_display_name"> diff --git a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml index e656fd7b07..a957a2b454 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml @@ -26,13 +26,22 @@ layout="topleft" top="10" left="8" - height="202" - width="202"/> + height="160" + width="160"/> + <loading_indicator + name="image_upload_indicator" + top="79" + left="77" + height="23" + width="23" + follows="top|left" + layout="topleft" + visible="false"/> <button name="fl_upload_image" label="Change Photo" - top="167" - left_pad="5" + top="127" + left="175" height="20" width="120" follows="top|left" @@ -50,7 +59,7 @@ name="fl_description_edit" trusted_content="false" enabled="false" - top="220" + top="180" left="6" right="-6" height="224" @@ -65,7 +74,7 @@ <button name="fl_save_changes" label="Save" - top="429" + top="389" right="-108" height="20" width="80" diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml index cc59e12c4b..6c2460378e 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml @@ -71,6 +71,16 @@ Account: [ACCTTYPE] left="2" bottom="-1" right="-1"/> + + <loading_indicator + name="image_upload_indicator" + top="69" + left="69" + height="23" + width="23" + follows="top|left" + layout="topleft" + visible="false"/> </layout_panel> <layout_panel @@ -134,6 +144,16 @@ Account: [ACCTTYPE] follows="left|top|right" layout="topleft"/> + <loading_indicator + name="progress_indicator" + left="56" + bottom="-30" + height="23" + width="23" + follows="left|bottom" + layout="topleft" + visible="false"/> + <menu_button layout="topleft" follows="left|bottom" @@ -323,6 +343,7 @@ Account: [ACCTTYPE] follows="all" layout="topleft" width="200" + height="159" auto_resize="true" user_resize="false"> <!-- notes are only for other agents --> @@ -340,10 +361,10 @@ Account: [ACCTTYPE] trusted_content="false" always_show_icons="true" enabled="false" - top_pad="1" + top="18" left="1" right="-1" - bottom="-27" + bottom="-1" follows="all" layout="topleft" bg_readonly_color="Transparent" |