From e4e58f0095dc47f8ab666b050a4a84aeb6fdd650 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 3 Aug 2012 14:58:57 -0400 Subject: When turning off create-account button, also turn off its title text. Login-panel logic distinguishes "system grid" from "non-system grid." With Oz's recent changes for pathfinding, now only agni and aditi are "system grids;" anything else configured into grids.xml is a "non-system grid." The difference is that when you select a "non-system grid" on the grid selector, we turn off the "lost password?" link and the "create account" button -- since how can we help with either if we don't recognize the grid? This logic already existed, but only turned off the create-account button, leaving the new title "CREATE YOUR ACCOUNT" over an empty corner of the login panel. Turn that off too. --- indra/newview/llpanellogin.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index ba25f78e0d..6bd174186a 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -908,9 +908,11 @@ void LLPanelLogin::updateServer() // update the login panel links bool system_grid = LLGridManager::getInstance()->isSystemGrid(); - - sInstance->getChildView("create_new_account_btn")->setVisible( system_grid); - sInstance->getChildView("forgot_password_text")->setVisible( system_grid); + + // Want to vanish not only create_new_account_btn, but also the + // title text over it, so turn on/off the whole layout_panel element. + sInstance->getChild("links")->setVisible(system_grid); + sInstance->getChildView("forgot_password_text")->setVisible(system_grid); // grid changed so show new splash screen (possibly) loadLoginPage(); -- cgit v1.2.3