summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-07-22 17:29:48 -0700
committerMerov Linden <merov@lindenlab.com>2013-07-22 17:29:48 -0700
commit2e266ac409510b7dd8e7b250509534e3d047ba17 (patch)
treec4ffadd36056cf4d6f12d99c0badc037ea32fc0a /indra
parent58d107130b41d9e1380079db6f29578a56ee99fb (diff)
parentccedada68154205eaab78e4bb188f7bebaa1e686 (diff)
Pull merge from lindenlab/viewer-fbc
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llfloatersocial.cpp10
-rw-r--r--indra/newview/skins/default/xui/en/panel_social_account.xml2
2 files changed, 1 insertions, 11 deletions
diff --git a/indra/newview/llfloatersocial.cpp b/indra/newview/llfloatersocial.cpp
index acfb0960be..6fd3650c7b 100644
--- a/indra/newview/llfloatersocial.cpp
+++ b/indra/newview/llfloatersocial.cpp
@@ -711,11 +711,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);
}
@@ -726,11 +721,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"