diff options
-rw-r--r-- | ChangeLog.txt | 5 | ||||
-rw-r--r-- | linden/indra/newview/llpanellogin.cpp | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index fef6fec..3fbe511 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -22,6 +22,11 @@ | |||
22 | 22 | ||
23 | 2009-11-07 McCabe Maxsted <hakushakukun@gmail.com> | 23 | 2009-11-07 McCabe Maxsted <hakushakukun@gmail.com> |
24 | 24 | ||
25 | * Fixed login page not updating after logout. | ||
26 | |||
27 | modified: linden/indra/newview/llpanellogin.cpp | ||
28 | |||
29 | |||
25 | * Fixed login grid combobox not updating correctly after logout. | 30 | * Fixed login grid combobox not updating correctly after logout. |
26 | 31 | ||
27 | modified: linden/indra/newview/llpanellogin.cpp | 32 | modified: linden/indra/newview/llpanellogin.cpp |
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp index 5dde3a3..629437d 100644 --- a/linden/indra/newview/llpanellogin.cpp +++ b/linden/indra/newview/llpanellogin.cpp | |||
@@ -870,13 +870,13 @@ void LLPanelLogin::refreshLoginPage() | |||
870 | if (!sInstance) return; | 870 | if (!sInstance) return; |
871 | 871 | ||
872 | sInstance->childSetVisible("create_new_account_text", | 872 | sInstance->childSetVisible("create_new_account_text", |
873 | !gHippoGridManager->getConnectedGrid()->getRegisterUrl().empty()); | 873 | !gHippoGridManager->getCurrentGrid()->getRegisterUrl().empty()); |
874 | sInstance->childSetVisible("forgot_password_text", | 874 | sInstance->childSetVisible("forgot_password_text", |
875 | !gHippoGridManager->getConnectedGrid()->getPasswordUrl().empty()); | 875 | !gHippoGridManager->getCurrentGrid()->getPasswordUrl().empty()); |
876 | 876 | ||
877 | // kick off a request to grab the url manually | 877 | // kick off a request to grab the url manually |
878 | gResponsePtr = LLIamHereLogin::build(sInstance); | 878 | gResponsePtr = LLIamHereLogin::build(sInstance); |
879 | std::string login_page = gHippoGridManager->getConnectedGrid()->getLoginPage(); | 879 | std::string login_page = gHippoGridManager->getCurrentGrid()->getLoginPage(); |
880 | if (!login_page.empty()) { | 880 | if (!login_page.empty()) { |
881 | LLHTTPClient::head(login_page, gResponsePtr); | 881 | LLHTTPClient::head(login_page, gResponsePtr); |
882 | } else { | 882 | } else { |
@@ -890,7 +890,7 @@ void LLPanelLogin::loadLoginPage() | |||
890 | if (!sInstance) return; | 890 | if (!sInstance) return; |
891 | 891 | ||
892 | 892 | ||
893 | std::string login_page = gHippoGridManager->getConnectedGrid()->getLoginPage(); | 893 | std::string login_page = gHippoGridManager->getCurrentGrid()->getLoginPage(); |
894 | if (login_page.empty()) { | 894 | if (login_page.empty()) { |
895 | sInstance->setSiteIsAlive(false); | 895 | sInstance->setSiteIsAlive(false); |
896 | return; | 896 | return; |