diff options
| -rw-r--r-- | indra/newview/llpanelprofile.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_profile_secondlife.xml | 16 |
2 files changed, 8 insertions, 11 deletions
diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp index 69e36a2df7..6c4e0e9878 100644 --- a/indra/newview/llpanelprofile.cpp +++ b/indra/newview/llpanelprofile.cpp @@ -996,7 +996,6 @@ void LLPanelProfileSecondLife::resetData() mCantEditObjectsIcon->setEnabled(false); childSetVisible("partner_layout", FALSE); - childSetVisible("partner_spacer_layout", TRUE); } void LLPanelProfileSecondLife::processProfileProperties(const LLAvatarData* avatar_data) @@ -1186,7 +1185,6 @@ void LLPanelProfileSecondLife::fillPartnerData(const LLAvatarData* avatar_data) if (avatar_data->partner_id.notNull()) { childSetVisible("partner_layout", TRUE); - childSetVisible("partner_spacer_layout", FALSE); LLStringUtil::format_map_t args; args["[LINK]"] = LLSLURL("agent", avatar_data->partner_id, "inspect").getSLURLString(); std::string partner_text = getString("partner_text", args); @@ -1195,7 +1193,6 @@ void LLPanelProfileSecondLife::fillPartnerData(const LLAvatarData* avatar_data) else { childSetVisible("partner_layout", FALSE); - childSetVisible("partner_spacer_layout", TRUE); } } 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 53bd9666c1..d8c4f97696 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml @@ -108,7 +108,7 @@ Account: [ACCTTYPE] name="partner_layout" follows="all" layout="topleft" - height="33" + height="30" auto_resize="false" user_resize="false" visible="true"> @@ -180,7 +180,7 @@ Account: [ACCTTYPE] name="online_text" value="Online" top="0" - left="13" + left="18" right="-1" height="16" follows="left|top|right" @@ -271,7 +271,7 @@ Account: [ACCTTYPE] <combo_box name="show_in_search" tool_tip="Let people see you in search results" - left="10" + left="1" top="18" height="23" width="140" @@ -301,7 +301,7 @@ Account: [ACCTTYPE] <menu_button layout="topleft" follows="left|top" - left="10" + left="1" top="25" height="25" width="140" @@ -338,7 +338,7 @@ Account: [ACCTTYPE] value="(loading...)" font="SansSerifBigLarge" top="0" - left="7" + left="8" height="20" width="200" follows="left|top|right" @@ -444,7 +444,7 @@ Account: [ACCTTYPE] commit_on_focus_lost="false" enabled="false" top="0" - left="1" + left="2" right="-1" bottom="-1" follows="all" @@ -506,7 +506,7 @@ Account: [ACCTTYPE] name="group_label" value="Group memberships" top="1" - left="1" + left="2" right="-1" height="16" follows="left|top|right" @@ -514,7 +514,7 @@ Account: [ACCTTYPE] <group_list name="group_list" top="18" - left="1" + left="2" right="-1" bottom="-1" follows="all" |