Sync'ing the login panel

Wed, 20 Apr 2016 17:20:26 +0200

author
Ansariel
date
Wed, 20 Apr 2016 17:20:26 +0200
changeset 48970
ec8f85627a09
parent 48969
782b5ac64396
child 48971
24909feee264

Sync'ing the login panel

indra/newview/fspanellogin.cpp file | annotate | diff | revisions
     1.1 --- a/indra/newview/fspanellogin.cpp	Wed Apr 20 16:33:30 2016 +0200
     1.2 +++ b/indra/newview/fspanellogin.cpp	Wed Apr 20 17:20:26 2016 +0200
     1.3 @@ -431,17 +431,10 @@
     1.4  						void (*callback)(S32 option, void* user_data),
     1.5  						void* callback_data)
     1.6  {
     1.7 -	// instance management
     1.8 -	if (FSPanelLogin::sInstance)
     1.9 -	{
    1.10 -		LL_WARNS("AppInit") << "Duplicate instance of login view deleted" << LL_ENDL;
    1.11 -		// Don't leave bad pointer in gFocusMgr
    1.12 -		gFocusMgr.setDefaultKeyboardFocus(NULL);
    1.13 -
    1.14 -		delete FSPanelLogin::sInstance;
    1.15 -	}
    1.16 -
    1.17 -	new FSPanelLogin(rect, callback, callback_data);
    1.18 +    if (!FSPanelLogin::sInstance)
    1.19 +    {
    1.20 +        new FSPanelLogin(rect, callback, callback_data);
    1.21 +    }
    1.22  
    1.23  	if( !gFocusMgr.getKeyboardFocus() )
    1.24  	{
    1.25 @@ -825,6 +818,9 @@
    1.26  	// sourceid
    1.27  	params["sourceid"] = gSavedSettings.getString("sourceid");
    1.28  
    1.29 +	// login page (web) content version
    1.30 +	params["login_content_version"] = gSavedSettings.getString("LoginContentVersion");
    1.31 +
    1.32  	// Make an LLURI with this augmented info
    1.33  	LLURI login_uri(LLURI::buildHTTP(login_page.authority(),
    1.34  									 login_page.path(),
    1.35 @@ -973,8 +969,8 @@
    1.36  // static
    1.37  void FSPanelLogin::onPassKey(LLLineEditor* caller, void* user_data)
    1.38  {
    1.39 -	FSPanelLogin *This = (FSPanelLogin *) user_data;
    1.40 -	This->mPasswordModified = TRUE;
    1.41 +	FSPanelLogin *self = (FSPanelLogin *)user_data;
    1.42 +	self->mPasswordModified = TRUE;
    1.43  	if (gKeyboard->getKeyDown(KEY_CAPSLOCK) && sCapslockDidNotification == FALSE)
    1.44  	{
    1.45  		// *TODO: use another way to notify user about enabled caps lock, see EXT-6858

mercurial