Commits

nat_linden committed 3af357c

Engage dormant first-login-this-install popup message.
Although the XUI for this popup, and the code to display and respond to it,
have been present from the first rev in the current viewer repository, I can
find no trace of it ever having been called.
Reword embedded link in popup message in each supported language: directly
mentioning secondlife.com in display text engages anti-URL-spoofing logic,
causing the popup to display the whole messy URL with sourceid and lang
params. Change to say "Second Life web site" instead -- needs translations.

Comments (0)

Files changed (13)

indra/newview/llstartup.cpp

 
 	if (STATE_LOGIN_SHOW == LLStartUp::getStartupState())
 	{
-		LL_DEBUGS("AppInit") << "Initializing Window" << LL_ENDL;
+		LL_DEBUGS("AppInit") << "Initializing Window, show_connect_box = "
+							 << show_connect_box << LL_ENDL;
 
 		// if we've gone backwards in the login state machine, to this state where we show the UI
 		// AND the debug setting to exit in this case is true, then go ahead and bail quickly
 		if ( mLoginStatePastUI && gSavedSettings.getBOOL("QuitOnLoginActivated") )
 		{
+			LL_DEBUGS("AppInit") << "taking QuitOnLoginActivated exit" << LL_ENDL;
 			// no requirement for notification here - just exit
 			LLAppViewer::instance()->earlyExitNoNotify();
 		}
 		// this startup phase more than once.
 		if (gLoginMenuBarView == NULL)
 		{
+			LL_DEBUGS("AppInit") << "initializing menu bar" << LL_ENDL;
 			display_startup();
 			initialize_edit_menu();
 			display_startup();
 
 		if (show_connect_box)
 		{
+			LL_DEBUGS("AppInit") << "show_connect_box on" << LL_ENDL;
 			// Load all the name information out of the login view
 			// NOTE: Hits "Attempted getFields with no login view shown" warning, since we don't
 			// show the login view until login_show() is called below.  
 			if (gUserCredential.isNull())                                                                          
 			{                                                  
+				LL_DEBUGS("AppInit") << "loading credentials from gLoginHandler" << LL_ENDL;
 				display_startup();
 				gUserCredential = gLoginHandler.initializeLoginInfo();                 
 				display_startup();
 			login_show();
 			display_startup();
 			// connect dialog is already shown, so fill in the names
-			if (gUserCredential.notNull())                                                                         
-			{                                                                                                      
-				LLPanelLogin::setFields( gUserCredential, gRememberPassword);                                  
-			}     
+			if (gUserCredential.notNull())
+			{
+				LLPanelLogin::setFields( gUserCredential, gRememberPassword);
+			}
 			display_startup();
 			LLPanelLogin::giveFocus();
 
+			if (gSavedSettings.getBOOL("FirstLoginThisInstall"))
+			{
+				LL_INFOS("AppInit") << "FirstLoginThisInstall, calling show_first_run_dialog()" << LL_ENDL;
+				show_first_run_dialog();
+			}
+			else
+			{
+				LL_DEBUGS("AppInit") << "FirstLoginThisInstall off" << LL_ENDL;
+			}
+
 			LLStartUp::setStartupState( STATE_LOGIN_WAIT );		// Wait for user input
 		}
 		else
 		{
+			LL_DEBUGS("AppInit") << "show_connect_box off, skipping to STATE_LOGIN_CLEANUP" << LL_ENDL;
 			// skip directly to message template verification
 			LLStartUp::setStartupState( STATE_LOGIN_CLEANUP );
 		}

indra/newview/skins/default/xui/da/notifications.xml

 		[APP_NAME] installationen er færdig.
 
 Hvis det er første gang du bruger [SECOND_LIFE], skal du først oprette en konto for at logge på.
-Vend tilbage til [[create_account_url] secondlife.com] for at oprette en ny konto?
+
+Vend tilbage til [[create_account_url] [SECOND_LIFE] web site] for at oprette en ny konto?
 	</notification>
 	<notification name="LoginPacketNeverReceived">
 		Der er problemer med at koble på.  Der kan være et problem med din Internet forbindelse eller [SECOND_LIFE_GRID].

indra/newview/skins/default/xui/de/notifications.xml

 		Installation von [APP_NAME] vollständig abgeschlossen.
 
 Falls Sie [SECOND_LIFE] zum ersten Mal verwenden, müssen Sie zuerst ein Konto erstellen, bevor Sie sich anmelden können.
-Zurück zu [[create_account_url] secondlife.com], um ein neues Konto zu erstellen?
+
+Zurück zu [[create_account_url] [SECOND_LIFE] web site], um ein neues Konto zu erstellen?
 		<usetemplate name="okcancelbuttons" notext="Weiter" yestext="Neues Konto..."/>
 	</notification>
 	<notification name="LoginPacketNeverReceived">

indra/newview/skins/default/xui/en/notifications.xml

 [APP_NAME] installation is complete.
 
 If this is your first time using [SECOND_LIFE], you will need to create an account before you can log in.
-Return to [[create_account_url] secondlife.com] to create a new account?
+
+Visit [[create_account_url] [SECOND_LIFE] web site] to create a new account?
     <tag>confirm</tag>
     <usetemplate
      name="okcancelbuttons"

indra/newview/skins/default/xui/es/notifications.xml

 		Se ha completado la instalación de [SECOND_LIFE].
 
 Si es la primera vez que usas [SECOND_LIFE], debes crear una cuenta antes de poder iniciar una sesión.
-¿Volver a [[create_account_url] secondlife.com] para crear una cuenta nueva?
+
+¿Volver a [[create_account_url] [SECOND_LIFE] web site] para crear una cuenta nueva?
 		<usetemplate name="okcancelbuttons" notext="Continuar" yestext="Cuenta nueva..."/>
 	</notification>
 	<notification name="LoginPacketNeverReceived">

indra/newview/skins/default/xui/fr/notifications.xml

 		L&apos;installation de [APP_NAME] est terminée.
 
 Si vous utilisez [SECOND_LIFE] pour la première fois, vous devez ouvrir un compte avant de pouvoir vous connecter.
-Retourner sur [[create_account_url] secondlife.com] pour ouvrir un nouveau compte ?
+
+Retourner sur [[create_account_url] [SECOND_LIFE] web site] pour ouvrir un nouveau compte ?
 		<usetemplate name="okcancelbuttons" notext="Continuer" yestext="Nouveau compte..."/>
 	</notification>
 	<notification name="LoginPacketNeverReceived">

indra/newview/skins/default/xui/it/notifications.xml

 		L&apos;installazione di [APP_NAME] è terminata.
 
 Se questa è la prima volta che usi [SECOND_LIFE], devi creare un account prima che tu possa effettuare l&apos;accesso.
-Vuoi tornare a [[create_account_url] secondlife.com] per creare un nuovo account?
+
+Vuoi tornare a [[create_account_url] [SECOND_LIFE] web site] per creare un nuovo account?
 		<usetemplate name="okcancelbuttons" notext="Continua" yestext="Nuovo Account..."/>
 	</notification>
 	<notification name="LoginPacketNeverReceived">

indra/newview/skins/default/xui/ja/notifications.xml

 		[APP_NAME] のインストールが完了しました。
 
 [SECOND_LIFE] を使ったことがない場合は、ログインする前にアカウントの作成を行ってください。
-[[create_account_url] secondlife.com] で新しいアカウントを作成しますか?
+
+[[create_account_url] [SECOND_LIFE] web site] で新しいアカウントを作成しますか?
 		<usetemplate name="okcancelbuttons" notext="続行" yestext="新規アカウント..."/>
 	</notification>
 	<notification name="LoginPacketNeverReceived">

indra/newview/skins/default/xui/pl/notifications.xml

 		Instalacja [APP_NAME] zakończona.
 
 Jeżeli używasz [SECOND_LIFE] po raz pierwszy to musisz stworzyć konto żeby móc się zalogować.
-Czy chcesz przejść na stronę [[create_account_url] secondlife.com] żeby stworzyć nowe konto?
+
+Czy chcesz przejść na stronę [[create_account_url] [SECOND_LIFE] web site] żeby stworzyć nowe konto?
 		<usetemplate name="okcancelbuttons" notext="Kontynuuj" yestext="Nowe konto..."/>
 	</notification>
 	<notification name="LoginPacketNeverReceived">

indra/newview/skins/default/xui/pt/notifications.xml

 		A instalação do [APP_NAME] está pronta. 
 
 Se você ainda não conhece o [SECOND_LIFE], basta criar uma conta para começar. 
-Voltar para [[create_account_url] secondlife.com] para criar sua conta?
+
+Voltar para [[create_account_url] [SECOND_LIFE] web site] para criar sua conta?
 		<usetemplate name="okcancelbuttons" notext="Continuar" yestext="Nova conta.."/>
 	</notification>
 	<notification name="LoginPacketNeverReceived">

indra/newview/skins/default/xui/ru/notifications.xml

 		Установка [APP_NAME] завершена.
 
 Если вы используете [SECOND_LIFE] впервые, для входа в программу вам потребуется создать аккаунт.
-Вернуться на [[create_account_url] secondlife.com] для создания аккаунта?
+
+Вернуться на [[create_account_url] [SECOND_LIFE] web site] для создания аккаунта?
 		<usetemplate name="okcancelbuttons" notext="Продолжить" yestext="Создать аккаунт..."/>
 	</notification>
 	<notification name="LoginPacketNeverReceived">

indra/newview/skins/default/xui/tr/notifications.xml

 		[APP_NAME] kurulumu tamamlandı.
 
 [SECOND_LIFE]&apos;ı ilk kez kullanıyorsanız, oturum açmadan önce bir hesap oluşturmalısınız.
-Yeni bir hesap oluşturmak için [[create_account_url] secondlife.com] adresine dönülsün mü?
+
+Yeni bir hesap oluşturmak için [[create_account_url] [SECOND_LIFE] web site] adresine dönülsün mü?
 		<usetemplate name="okcancelbuttons" notext="Devam" yestext="Yeni Hesap..."/>
 	</notification>
 	<notification name="LoginPacketNeverReceived">

indra/newview/skins/default/xui/zh/notifications.xml

 		[APP_NAME] 安裝完成。
 
 If this is your first time using [SECOND_LIFE], you will need to create an account before you can log in.
-Return to [[create_account_url] secondlife.com] to create a new account?
+
+Return to [[create_account_url] [SECOND_LIFE] web site] to create a new account?
 		<usetemplate name="okcancelbuttons" notext="繼續" yestext="新帳戶..."/>
 	</notification>
 	<notification name="LoginPacketNeverReceived">