diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-07-22 15:49:26 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-07-22 15:49:26 -0700 |
| commit | 827553f314d411c489bd99048181be5f5ff16d89 (patch) | |
| tree | 770ff38925632903c8c7ef5a0331c3582fa0fca8 | |
| parent | c3c61018cd2d6547c4976c04edc4d3212cf3fb31 (diff) | |
ACME-726: Display 'You are connected to Facebook as' text and the user's account name
| -rw-r--r-- | indra/newview/llfloatersocial.cpp | 10 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_social_account.xml | 2 |
2 files changed, 1 insertions, 11 deletions
diff --git a/indra/newview/llfloatersocial.cpp b/indra/newview/llfloatersocial.cpp index d734518cbb..e93a560f8f 100644 --- a/indra/newview/llfloatersocial.cpp +++ b/indra/newview/llfloatersocial.cpp @@ -713,11 +713,6 @@ void LLSocialAccountPanel::showConnectButton() if(!mConnectButton->getVisible()) { mConnectButton->setVisible(TRUE); - LLRect mLayoutStackRect = mPanelButtons->getRect(); - F32 deltaTopPadding = mConnectButton->getRect().mBottom - mUseAnotherAccountButton->getRect().mTop; - mLayoutStackRect.translate(0, -(mConnectButton->getRect().getHeight() + deltaTopPadding)); - mPanelButtons->setRect(mLayoutStackRect); - mUseAnotherAccountButton->setVisible(FALSE); mDisconnectButton->setVisible(FALSE); } @@ -728,11 +723,6 @@ void LLSocialAccountPanel::hideConnectButton() if(mConnectButton->getVisible()) { mConnectButton->setVisible(FALSE); - LLRect mLayoutStackRect = mPanelButtons->getRect(); - F32 deltaTopPadding = mConnectButton->getRect().mBottom - mUseAnotherAccountButton->getRect().mTop; - mLayoutStackRect.translate(0, mConnectButton->getRect().getHeight() + deltaTopPadding); - mPanelButtons->setRect(mLayoutStackRect); - mUseAnotherAccountButton->setVisible(TRUE); mDisconnectButton->setVisible(TRUE); } diff --git a/indra/newview/skins/default/xui/en/panel_social_account.xml b/indra/newview/skins/default/xui/en/panel_social_account.xml index 8706aac5ce..7bd3bb191e 100644 --- a/indra/newview/skins/default/xui/en/panel_social_account.xml +++ b/indra/newview/skins/default/xui/en/panel_social_account.xml @@ -52,7 +52,7 @@ <button layout="topleft" follows="left|top" - top_pad="9" + top_delta="0" height="23" label="Use another account..." name="use_another_account_btn" |