From 0d3fb07bfa205b65f242ef2b761e827ff30e42fe Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Wed, 3 Jun 2015 16:04:40 -0700 Subject: Remove vestigial httpclient.h include from files that no longer need it. --- indra/newview/llpanellogin.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview/llpanellogin.cpp') diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index cc8c3edd51..99c9fad82d 100755 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -59,7 +59,6 @@ #include "llviewernetwork.h" #include "llviewerwindow.h" // to link into child list #include "lluictrlfactory.h" -#include "llhttpclient.h" #include "llweb.h" #include "llmediactrl.h" #include "llrootview.h" -- cgit v1.2.3 From 907efc9cc9bcf4a935ed0e1bd17b19da2bb99dce Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Tue, 15 Sep 2015 17:01:26 -0700 Subject: MAINT-5507: Remove llcurl, move constant values and untilities to llcorehttp lib --- indra/newview/llpanellogin.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview/llpanellogin.cpp') diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index f972b320c3..bd23478694 100755 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -40,7 +40,6 @@ #include "llcheckboxctrl.h" #include "llcommandhandler.h" // for secondlife:///app/login/ #include "llcombobox.h" -#include "llcurl.h" #include "llviewercontrol.h" #include "llfloaterpreference.h" #include "llfocusmgr.h" -- cgit v1.2.3 From 1888142cab8ce7368c38d3f3ce745c46b70d423c Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Tue, 22 Sep 2015 16:58:00 -0700 Subject: Reuse old login panel... --- indra/newview/llpanellogin.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'indra/newview/llpanellogin.cpp') diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index bd23478694..8c5ad133f5 100755 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -434,6 +434,12 @@ void LLPanelLogin::show(const LLRect &rect, void (*callback)(S32 option, void* user_data), void* callback_data) { +#if 1 + if (!LLPanelLogin::sInstance) + { + new LLPanelLogin(rect, callback, callback_data); + } +#else // instance management if (LLPanelLogin::sInstance) { @@ -445,6 +451,7 @@ void LLPanelLogin::show(const LLRect &rect, } new LLPanelLogin(rect, callback, callback_data); +#endif if( !gFocusMgr.getKeyboardFocus() ) { -- cgit v1.2.3 From b9cfd6631fe08de916ee2b43e08117bc8a2416a2 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Thu, 24 Sep 2015 13:03:28 -0700 Subject: MAINT-5614: Put the sInstance back the way it was for llpanellogin --- indra/newview/llpanellogin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llpanellogin.cpp') diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 8c5ad133f5..3743aee00f 100755 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -434,7 +434,7 @@ void LLPanelLogin::show(const LLRect &rect, void (*callback)(S32 option, void* user_data), void* callback_data) { -#if 1 +#if 0 if (!LLPanelLogin::sInstance) { new LLPanelLogin(rect, callback, callback_data); -- cgit v1.2.3 From 290524e871f9846761db2960ea03c0669f085b30 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Tue, 29 Sep 2015 15:57:50 -0700 Subject: MAINT-5614: Cancel the fade timer for the progress screen when hidding progress. --- indra/newview/llpanellogin.cpp | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'indra/newview/llpanellogin.cpp') diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 3743aee00f..360b144604 100755 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -434,24 +434,10 @@ void LLPanelLogin::show(const LLRect &rect, void (*callback)(S32 option, void* user_data), void* callback_data) { -#if 0 if (!LLPanelLogin::sInstance) { new LLPanelLogin(rect, callback, callback_data); } -#else - // instance management - if (LLPanelLogin::sInstance) - { - LL_WARNS("AppInit") << "Duplicate instance of login view deleted" << LL_ENDL; - // Don't leave bad pointer in gFocusMgr - gFocusMgr.setDefaultKeyboardFocus(NULL); - - delete LLPanelLogin::sInstance; - } - - new LLPanelLogin(rect, callback, callback_data); -#endif if( !gFocusMgr.getKeyboardFocus() ) { -- cgit v1.2.3