summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2012-07-24 08:54:01 -0400
committerNat Goodspeed <nat@lindenlab.com>2012-07-24 08:54:01 -0400
commit300662919e3fd5eb29b123fc555f176498e41a53 (patch)
tree7e6b3513486743d1b222848fa487df5a92dd5442 /indra/newview
parentfc8d6384b744805631ae1183c52908f49e2a4765 (diff)
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.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llstartup.cpp26
-rw-r--r--indra/newview/skins/default/xui/da/notifications.xml3
-rw-r--r--indra/newview/skins/default/xui/de/notifications.xml3
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml3
-rw-r--r--indra/newview/skins/default/xui/es/notifications.xml3
-rw-r--r--indra/newview/skins/default/xui/fr/notifications.xml3
-rw-r--r--indra/newview/skins/default/xui/it/notifications.xml3
-rw-r--r--indra/newview/skins/default/xui/ja/notifications.xml3
-rw-r--r--indra/newview/skins/default/xui/pl/notifications.xml3
-rw-r--r--indra/newview/skins/default/xui/pt/notifications.xml3
-rw-r--r--indra/newview/skins/default/xui/ru/notifications.xml3
-rw-r--r--indra/newview/skins/default/xui/tr/notifications.xml3
-rw-r--r--indra/newview/skins/default/xui/zh/notifications.xml3
13 files changed, 45 insertions, 17 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 6b0fc26db7..1e8f3406c2 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -720,12 +720,14 @@ bool idle_startup()
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();
}
@@ -738,6 +740,7 @@ bool idle_startup()
// this startup phase more than once.
if (gLoginMenuBarView == NULL)
{
+ LL_DEBUGS("AppInit") << "initializing menu bar" << LL_ENDL;
display_startup();
initialize_edit_menu();
display_startup();
@@ -747,11 +750,13 @@ bool idle_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();
@@ -768,17 +773,28 @@ bool idle_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 );
}
diff --git a/indra/newview/skins/default/xui/da/notifications.xml b/indra/newview/skins/default/xui/da/notifications.xml
index 54de89e31b..e53058736b 100644
--- a/indra/newview/skins/default/xui/da/notifications.xml
+++ b/indra/newview/skins/default/xui/da/notifications.xml
@@ -481,7 +481,8 @@ Du kan bruge [SECOND_LIFE] normalt og andre personer vil se dig korrekt.
[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].
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index dc9bb0e37e..4939cb1d26 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -1181,7 +1181,8 @@ Sie können [SECOND_LIFE] normal verwenden. Andere Benutzer können Sie korrekt
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">
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 1e7aacd999..6ae458e691 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2803,7 +2803,8 @@ You can use [SECOND_LIFE] normally and other people will see you correctly.
[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"
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index 2fd4c67d98..9730beca65 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -1171,7 +1171,8 @@ Puedes usar [SECOND_LIFE] de forma normal; los demás residentes te verán corre
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">
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index 0d2dc3f6f4..3119bce1f3 100644
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -1162,7 +1162,8 @@ Vous pouvez utiliser [SECOND_LIFE] normalement, les autres résidents vous voien
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">
diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml
index fd312a2c01..03e684f8dc 100644
--- a/indra/newview/skins/default/xui/it/notifications.xml
+++ b/indra/newview/skins/default/xui/it/notifications.xml
@@ -1167,7 +1167,8 @@ Puoi comunque usare [SECOND_LIFE] normalmente e gli altri residenti ti vedranno
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">
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index 4454096180..e807c417fd 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -1201,7 +1201,8 @@ L$ は返金されません。
[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">
diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml
index 84f9b06339..fb6d67047e 100644
--- a/indra/newview/skins/default/xui/pl/notifications.xml
+++ b/indra/newview/skins/default/xui/pl/notifications.xml
@@ -1106,7 +1106,8 @@ Możesz normalnie używać [SECOND_LIFE], inni użytkownicy będą Cię widzieli
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">
diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml
index 304ff36f81..a45e874ca8 100644
--- a/indra/newview/skins/default/xui/pt/notifications.xml
+++ b/indra/newview/skins/default/xui/pt/notifications.xml
@@ -1156,7 +1156,8 @@ Enquando isso, use o [SECOND_LIFE] normalmente. Seu visual será exibido correta
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">
diff --git a/indra/newview/skins/default/xui/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml
index f76071d191..de15e3db8d 100644
--- a/indra/newview/skins/default/xui/ru/notifications.xml
+++ b/indra/newview/skins/default/xui/ru/notifications.xml
@@ -1167,7 +1167,8 @@
Установка [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">
diff --git a/indra/newview/skins/default/xui/tr/notifications.xml b/indra/newview/skins/default/xui/tr/notifications.xml
index 79e7b9e592..c91c49556a 100644
--- a/indra/newview/skins/default/xui/tr/notifications.xml
+++ b/indra/newview/skins/default/xui/tr/notifications.xml
@@ -1167,7 +1167,8 @@ Yeni bir ana konum ayarlamak isteyebilirsiniz.
[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">
diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml
index c39b123655..e322064f85 100644
--- a/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/indra/newview/skins/default/xui/zh/notifications.xml
@@ -1128,7 +1128,8 @@ You may want to set a new home location.
[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">