diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-08-03 14:58:57 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-08-03 14:58:57 -0400 |
| commit | e4e58f0095dc47f8ab666b050a4a84aeb6fdd650 (patch) | |
| tree | 007cb5f3bb14c0dce64f3a23a3d809c3122595e3 /indra | |
| parent | df767cef781c9bf7a64f892918f07e5f463d5df0 (diff) | |
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.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llpanellogin.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
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<LLLayoutPanel>("links")->setVisible(system_grid); + sInstance->getChildView("forgot_password_text")->setVisible(system_grid); // grid changed so show new splash screen (possibly) loadLoginPage(); |