#5557 adjust buttons position when hiding grid selector (#5559)

1 files changed, 14 insertions, 0 deletions

diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index 77de25c28e..6449141b8c 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -242,6 +242,9 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
     // change z sort of clickable text to be behind buttons
     sendChildToBack(getChildView("forgot_password_text"));
 
+    mLoginStack = getChild<LLLayoutStack>("login_stack");
+    mGridPanel = getChild<LLLayoutPanel>("grid_panel");
+
     std::string current_grid = LLGridManager::getInstance()->getGrid();
     if (!mFirstLoginThisInstall)
     {
@@ -766,6 +769,7 @@ void LLPanelLogin::updateLocationSelectorsVisibility()
         {
             grid_txt->setVisible(show_server);
         }
+        sInstance->collapseGridPanel(!show_server);
     }
 }
 
@@ -1401,3 +1405,13 @@ bool LLPanelLogin::onUpdateNotification(const LLSD& notify)
     }
     return false;
 }
+
+void LLPanelLogin::collapseGridPanel(bool collapse)
+{
+    if (mGridPanel->isCollapsed() == collapse)
+    {
+        return;
+    }
+    mLoginStack->collapsePanel(mGridPanel, collapse);
+    mLoginStack->updateLayout();
+}