summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--indra/newview/llpanellogin.cpp13
-rw-r--r--indra/newview/skins/default/xui/da/panel_login.xml15
-rw-r--r--indra/newview/skins/default/xui/de/panel_login.xml15
-rw-r--r--indra/newview/skins/default/xui/en/panel_login.xml53
-rw-r--r--indra/newview/skins/default/xui/es/panel_login.xml15
-rw-r--r--indra/newview/skins/default/xui/fr/panel_login.xml15
-rw-r--r--indra/newview/skins/default/xui/it/panel_login.xml15
-rw-r--r--indra/newview/skins/default/xui/ja/panel_login.xml15
-rw-r--r--indra/newview/skins/default/xui/pl/panel_login.xml15
-rw-r--r--indra/newview/skins/default/xui/pt/panel_login.xml15
-rw-r--r--indra/newview/skins/default/xui/ru/panel_login.xml15
-rw-r--r--indra/newview/skins/default/xui/tr/panel_login.xml15
-rw-r--r--indra/newview/skins/default/xui/zh/panel_login.xml15
13 files changed, 111 insertions, 120 deletions
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index e37155aeb6..c4bd8c750d 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -27,6 +27,7 @@
#include "llviewerprecompiledheaders.h"
#include "llpanellogin.h"
+#include "lllayoutstack.h"
#include "indra_constants.h" // for key and mask constants
#include "llfloaterreg.h"
@@ -161,7 +162,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
childSetAction("connect_btn", onClickConnect, this);
- getChild<LLPanel>("login")->setDefaultBtn("connect_btn");
+ getChild<LLPanel>("links_login_panel")->setDefaultBtn("connect_btn");
std::string channel = LLVersionInfo::getChannel();
std::string version = llformat("%s (%d)",
@@ -640,13 +641,11 @@ void LLPanelLogin::updateLocationCombo( bool force_visible )
if ( ! force_visible )
show_start = gSavedSettings.getBOOL("ShowStartLocation");
-
- sInstance->getChildView("start_location_combo")->setVisible( show_start);
- sInstance->getChildView("start_location_text")->setVisible( show_start);
-
+
+ sInstance->getChild<LLLayoutPanel>("start_location_panel")->setVisible(show_start);
+
BOOL show_server = gSavedSettings.getBOOL("ForceShowGrid");
- sInstance->getChildView("server_combo_text")->setVisible( show_server);
- sInstance->getChildView("server_combo")->setVisible( show_server);
+ sInstance->getChild<LLLayoutPanel>("grid_panel")->setVisible(show_server);
}
// static
diff --git a/indra/newview/skins/default/xui/da/panel_login.xml b/indra/newview/skins/default/xui/da/panel_login.xml
index c2fd3c44c7..b7cb76d4cb 100644
--- a/indra/newview/skins/default/xui/da/panel_login.xml
+++ b/indra/newview/skins/default/xui/da/panel_login.xml
@@ -15,15 +15,8 @@
<text name="password_text">
Password:
</text>
- <check_box label="Husk password" name="remember_check"/>
- <button label="Log på" name="connect_btn"/>
- <text name="mode_selection_text">
- Tilstand:
- </text>
- <combo_box name="mode_combo" tool_tip="Vælg ønsket tilstand. Vælg basis for hurtig og nem udforskning og chat. Vælg avanceret for at få adgang til flere muligheder.">
- <combo_box.item label="Basis" name="Basic"/>
- <combo_box.item label="Avanceret" name="Advanced"/>
- </combo_box>
+ </layout_panel>
+ <layout_panel name="start_location_panel">
<text name="start_location_text">
Start ved:
</text>
@@ -32,12 +25,16 @@
<combo_box.item label="Hjem" name="MyHome"/>
<combo_box.item label="&lt;Indtast regionnavn&gt;" name="Typeregionname"/>
</combo_box>
+ </layout_panel>
+ <layout_panel name="links_login_panel">
<text name="login_help">
Hjælp til login
</text>
<text name="forgot_password_text">
Har du glemt brugernavn eller password?
</text>
+ <button label="Log på" name="connect_btn"/>
+ <check_box label="Husk password" name="remember_check"/>
</layout_panel>
<layout_panel name="links">
<text name="create_account_text">
diff --git a/indra/newview/skins/default/xui/de/panel_login.xml b/indra/newview/skins/default/xui/de/panel_login.xml
index 26fbc64ab6..2203b6d310 100644
--- a/indra/newview/skins/default/xui/de/panel_login.xml
+++ b/indra/newview/skins/default/xui/de/panel_login.xml
@@ -15,15 +15,8 @@
<text name="password_text">
Kennwort:
</text>
- <check_box label="Kennwort merken" name="remember_check"/>
- <button label="Anmelden" name="connect_btn"/>
- <text name="mode_selection_text">
- Modus:
- </text>
- <combo_box name="mode_combo" tool_tip="Wählen Sie den gewünschten Modus aus. Basis: Second Life schnell und einfach erkunden und chatten. Erweitert: Zugriff auf zusätzliche Funktionen.">
- <combo_box.item label="Basis" name="Basic"/>
- <combo_box.item label="Erweitert" name="Advanced"/>
- </combo_box>
+ </layout_panel>
+ <layout_panel name="start_location_panel">
<text name="start_location_text">
Hier anfangen:
</text>
@@ -32,12 +25,16 @@
<combo_box.item label="Mein Zuhause" name="MyHome"/>
<combo_box.item label="&lt;Region eingeben&gt;" name="Typeregionname"/>
</combo_box>
+ </layout_panel>
+ <layout_panel name="links_login_panel">
<text name="login_help">
Sie brauchen Hilfe?
</text>
<text name="forgot_password_text">
Benutzernamen oder Kennwort vergessen?
</text>
+ <button label="Anmelden" name="connect_btn"/>
+ <check_box label="Kennwort merken" name="remember_check"/>
</layout_panel>
<layout_panel name="links">
<text name="create_account_text">
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 8a1dd6750b..48f6a654d8 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -7,7 +7,7 @@ left="0"
name="panel_login"
focus_root="true"
top="600"
- width="996">
+ width="1130">
<string name="reg_in_client_url" translate="false">
http://secondlife.eniac15.lindenlab.com/reg-in-client/
</string>
@@ -28,22 +28,23 @@ top="600"
start_url=""
top="0"
height="600"
- width="980"/>
+ width="996"/>
<layout_stack
+animate="false"
follows="left|bottom|right"
name="login_widgets"
layout="topleft"
orientation="horizontal"
top="519"
-width="996"
+width="1130"
height="80">
<layout_panel
auto_resize="false"
follows="left|bottom"
name="login"
layout="topleft"
-width="900"
-min_width="865"
+width="310"
+min_width="310"
height="80">
<text
follows="left|bottom"
@@ -104,11 +105,20 @@ is_password="true"
select_on_focus="true"
top_pad="0"
width="135" />
+</layout_panel>
+<layout_panel
+auto_resize="false"
+follows="left|bottom"
+name="start_location_panel"
+layout="topleft"
+width="175"
+min_width="175"
+height="80">
<text
follows="left|bottom"
font="SansSerifSmall"
height="16"
-left="320"
+left="10"
name="start_location_text"
top="35"
width="130">
@@ -135,24 +145,41 @@ name="MyHome"
label="&lt;Type region name&gt;"
name="Typeregionname" value="" />
</combo_box>
+</layout_panel>
+<layout_panel
+auto_resize="false"
+follows="left|bottom"
+name="grid_panel"
+layout="topleft"
+width="145"
+height="80"
+visible="false">
<combo_box
allow_text_entry="true"
font="SansSerifSmall"
follows="left|right|bottom"
height="23"
max_chars="256"
-left="490"
+left="10"
top="51"
layout="topleft"
top_pad="2"
name="server_combo"
-width="135"
- visible="false" />
+width="135" />
+</layout_panel>
+<layout_panel
+auto_resize="false"
+follows="left|bottom"
+name="links_login_panel"
+layout="topleft"
+width="290"
+height="80">
<text
follows="left|bottom"
font="SansSerifSmall"
text_color="EmphasisColor"
-left="630"
+left="10"
+height="16"
name="login_help"
top="19"
width="280">
@@ -171,21 +198,19 @@ width="280">
<button
follows="left|bottom"
top_pad="0"
- left="630"
height="23"
image_unselected="PushButton_On"
image_selected="PushButton_On_Selected"
label="Log In"
label_color="White"
layout="topleft"
- left_pad="10"
name="connect_btn"
width="90" />
<check_box
control_name="RememberPassword"
follows="left|bottom"
font="SansSerifSmall"
-left="730"
+left="100"
top="56"
height="16"
label="Remember password"
@@ -196,7 +221,7 @@ label="Remember password"
<layout_panel
tab_stop="false"
follows="right|bottom"
-name="links"
+name="links"
width="210"
min_width="210"
height="80">
diff --git a/indra/newview/skins/default/xui/es/panel_login.xml b/indra/newview/skins/default/xui/es/panel_login.xml
index 5fb7ea1b10..683e0a096a 100644
--- a/indra/newview/skins/default/xui/es/panel_login.xml
+++ b/indra/newview/skins/default/xui/es/panel_login.xml
@@ -15,15 +15,8 @@
<text name="password_text">
Contraseña:
</text>
- <check_box label="Recordar la contraseña" name="remember_check"/>
- <button label="Iniciar sesión" name="connect_btn"/>
- <text name="mode_selection_text">
- Modo:
- </text>
- <combo_box name="mode_combo" tool_tip="Selecciona el modo. Elige Básico para una exploración rápida y fácil y para chatear. Elige Avanzado para tener acceso a más funciones.">
- <combo_box.item label="Básico" name="Basic"/>
- <combo_box.item label="Avanzado" name="Advanced"/>
- </combo_box>
+ </layout_panel>
+ <layout_panel name="start_location_panel">
<text name="start_location_text">
Empezar en:
</text>
@@ -32,12 +25,16 @@
<combo_box.item label="Mi Base" name="MyHome"/>
<combo_box.item label="&lt;Escribe en qué región&gt;" name="Typeregionname"/>
</combo_box>
+ </layout_panel>
+ <layout_panel name="links_login_panel">
<text name="login_help">
¿Necesitas ayuda para conectarte?
</text>
<text name="forgot_password_text">
¿Olvidaste el nombre de usuario o la contraseña?
</text>
+ <button label="Iniciar sesión" name="connect_btn"/>
+ <check_box label="Recordar la contraseña" name="remember_check"/>
</layout_panel>
<layout_panel name="links">
<text name="create_account_text">
diff --git a/indra/newview/skins/default/xui/fr/panel_login.xml b/indra/newview/skins/default/xui/fr/panel_login.xml
index ccc8be05b8..7843513e00 100644
--- a/indra/newview/skins/default/xui/fr/panel_login.xml
+++ b/indra/newview/skins/default/xui/fr/panel_login.xml
@@ -15,15 +15,8 @@
<text name="password_text">
Mot de passe :
</text>
- <check_box label="Enregistrer" name="remember_check"/>
- <button label="Connexion" name="connect_btn"/>
- <text name="mode_selection_text">
- Mode :
- </text>
- <combo_box name="mode_combo" tool_tip="Sélectionnez un mode. Pour une exploration facile et rapide avec chat, choisissez Basique. Pour accéder à plus de fonctionnalités, choisissez Avancé.">
- <combo_box.item label="Basique" name="Basic"/>
- <combo_box.item label="Avancé" name="Advanced"/>
- </combo_box>
+ </layout_panel>
+ <layout_panel name="start_location_panel">
<text name="start_location_text">
Lieu de départ :
</text>
@@ -32,12 +25,16 @@
<combo_box.item label="Domicile" name="MyHome"/>
<combo_box.item label="&lt;Saisir le nom de la région&gt;" name="Typeregionname"/>
</combo_box>
+ </layout_panel>
+ <layout_panel name="links_login_panel">
<text name="login_help">
Besoin d&apos;aide ?
</text>
<text name="forgot_password_text">
Nom d&apos;utilisateur ou mot de passe oublié ?
</text>
+ <button label="Connexion" name="connect_btn"/>
+ <check_box label="Enregistrer" name="remember_check"/>
</layout_panel>
<layout_panel name="links">
<text name="create_account_text">
diff --git a/indra/newview/skins/default/xui/it/panel_login.xml b/indra/newview/skins/default/xui/it/panel_login.xml
index 2019eadc70..02a3f8271c 100644
--- a/indra/newview/skins/default/xui/it/panel_login.xml
+++ b/indra/newview/skins/default/xui/it/panel_login.xml
@@ -15,15 +15,8 @@
<text name="password_text">
Password:
</text>
- <check_box label="Ricorda password" name="remember_check"/>
- <button label="Accedi" name="connect_btn"/>
- <text name="mode_selection_text">
- Modalità:
- </text>
- <combo_box name="mode_combo" tool_tip="Seleziona la modalità. Seleziona Di base per esplorare facilmente e rapidamente e per la chat. Seleziona Avanzata per accedere ad altre funzionalità.">
- <combo_box.item label="Di base" name="Basic"/>
- <combo_box.item label="Avanzate" name="Advanced"/>
- </combo_box>
+ </layout_panel>
+ <layout_panel name="start_location_panel">
<text name="start_location_text">
Inizia da:
</text>
@@ -32,12 +25,16 @@
<combo_box.item label="Casa mia" name="MyHome"/>
<combo_box.item label="&lt;Scrivi nome regione&gt;" name="Typeregionname"/>
</combo_box>
+ </layout_panel>
+ <layout_panel name="links_login_panel">
<text name="login_help">
Ti serve aiuto con la fase di accesso?
</text>
<text name="forgot_password_text">
Hai dimenticato il nome utente o la password?
</text>
+ <button label="Accedi" name="connect_btn"/>
+ <check_box label="Ricorda password" name="remember_check"/>
</layout_panel>
<layout_panel name="links">
<text name="create_account_text">
diff --git a/indra/newview/skins/default/xui/ja/panel_login.xml b/indra/newview/skins/default/xui/ja/panel_login.xml
index f883d65a92..780f7aa1ae 100644
--- a/indra/newview/skins/default/xui/ja/panel_login.xml
+++ b/indra/newview/skins/default/xui/ja/panel_login.xml
@@ -15,15 +15,8 @@
<text name="password_text">
パスワード：
</text>
- <check_box label="パスワードを記憶" name="remember_check"/>
- <button label="ログイン" left_pad="30" name="connect_btn" width="60"/>
- <text name="mode_selection_text">
- モード：
- </text>
- <combo_box name="mode_combo" tool_tip="モードを選択します。ベーシックモードでは探索やチャットをすばやく簡単に実行でき、アドバンスモードでは、より多くの機能が利用できます。">
- <combo_box.item label="ベーシック" name="Basic"/>
- <combo_box.item label="アドバンス" name="Advanced"/>
- </combo_box>
+ </layout_panel>
+ <layout_panel name="start_location_panel">
<text name="start_location_text">
開始地点：
</text>
@@ -32,12 +25,16 @@
<combo_box.item label="ホーム" name="MyHome"/>
<combo_box.item label="＜地域名を入力＞" name="Typeregionname"/>
</combo_box>
+ </layout_panel>
+ <layout_panel name="links_login_panel">
<text name="login_help">
ログインの方法
</text>
<text name="forgot_password_text">
ユーザー名またはパスワードをお忘れですか？
</text>
+ <button label="ログイン" left_pad="30" name="connect_btn" width="60"/>
+ <check_box label="パスワードを記憶" name="remember_check"/>
</layout_panel>
<layout_panel name="links">
<text name="create_account_text">
diff --git a/indra/newview/skins/default/xui/pl/panel_login.xml b/indra/newview/skins/default/xui/pl/panel_login.xml
index c21d9bc684..c87a3d3bd4 100644
--- a/indra/newview/skins/default/xui/pl/panel_login.xml
+++ b/indra/newview/skins/default/xui/pl/panel_login.xml
@@ -15,15 +15,8 @@
<text name="password_text">
Hasło:
</text>
- <check_box label="Zapamiętaj hasło" name="remember_check"/>
- <button label="Połącz" name="connect_btn"/>
- <text name="mode_selection_text">
- Tryb życia:
- </text>
- <combo_box name="mode_combo" tool_tip="Wybierz tryb życia. Wybierz tryb turystyczny dla łatwego zwiedzania i czatowania. Wybierz tryb zaawansowany aby mieć dostęp do większej ilości opcji.">
- <combo_box.item label="Turystyczny" name="Basic"/>
- <combo_box.item label="Zaawansowany" name="Advanced"/>
- </combo_box>
+ </layout_panel>
+ <layout_panel name="start_location_panel">
<text name="start_location_text">
Rozpocznij w:
</text>
@@ -32,12 +25,16 @@
<combo_box.item label="Moje Miejsce Startu" name="MyHome"/>
<combo_box.item label="&lt;Wpisz Region&gt;" name="Typeregionname"/>
</combo_box>
+ </layout_panel>
+ <layout_panel name="links_login_panel">
<text name="login_help">
Potrzebujesz pomocy z logowaniem się?
</text>
<text name="forgot_password_text">
Zapomniałeś swojej nazwy użytkownika lub hasła?
</text>
+ <button label="Połącz" name="connect_btn"/>
+ <check_box label="Zapamiętaj hasło" name="remember_check"/>
</layout_panel>
<layout_panel name="links">
<text name="create_account_text">
diff --git a/indra/newview/skins/default/xui/pt/panel_login.xml b/indra/newview/skins/default/xui/pt/panel_login.xml
index 0b99e2a70e..25a2c9fda0 100644
--- a/indra/newview/skins/default/xui/pt/panel_login.xml
+++ b/indra/newview/skins/default/xui/pt/panel_login.xml
@@ -15,15 +15,8 @@
<text name="password_text">
Senha:
</text>
- <check_box label="Lembrar senha" name="remember_check"/>
- <button label="conectar" name="connect_btn"/>
- <text name="mode_selection_text">
- Modo:
- </text>
- <combo_box name="mode_combo" tool_tip="Selecione o modo. O modo Básico é mais rápido e ideal para explorar e conversar. Use o modo Avançado para acessar mais recursos.">
- <combo_box.item label="Básico" name="Basic"/>
- <combo_box.item label="Avançado" name="Advanced"/>
- </combo_box>
+ </layout_panel>
+ <layout_panel name="start_location_panel">
<text name="start_location_text">
Começar em:
</text>
@@ -31,12 +24,16 @@
<combo_box.item label="Última posição" name="MyLastLocation"/>
<combo_box.item label="Meu início" name="MyHome"/>
</combo_box>
+ </layout_panel>
+ <layout_panel name="links_login_panel">
<text name="login_help">
Precisa de ajuda ao conectar?
</text>
<text name="forgot_password_text">
Esqueceu seu nome ou senha?
</text>
+ <button label="conectar" name="connect_btn"/>
+ <check_box label="Lembrar senha" name="remember_check"/>
</layout_panel>
<layout_panel name="links">
<text name="create_account_text">
diff --git a/indra/newview/skins/default/xui/ru/panel_login.xml b/indra/newview/skins/default/xui/ru/panel_login.xml
index 5b751e4f92..7ead924c1f 100644
--- a/indra/newview/skins/default/xui/ru/panel_login.xml
+++ b/indra/newview/skins/default/xui/ru/panel_login.xml
@@ -15,15 +15,8 @@
<text name="password_text">
Пароль:
</text>
- <check_box label="Запомнить пароль" name="remember_check"/>
- <button label="Войти" name="connect_btn"/>
- <text name="mode_selection_text">
- Режим:
- </text>
- <combo_box name="mode_combo" tool_tip="Выберите режим. Основной – для быстрого и простого ознакомления с игрой, а также общения. Расширенный – для доступа к более широким возможностям.">
- <combo_box.item label="Основной" name="Basic"/>
- <combo_box.item label="Расширенный" name="Advanced"/>
- </combo_box>
+ </layout_panel>
+ <layout_panel name="start_location_panel">
<text name="start_location_text">
Место старта:
</text>
@@ -32,12 +25,16 @@
<combo_box.item label="Мой дом" name="MyHome"/>
<combo_box.item label="&lt;Введите название региона&gt;" name="Typeregionname"/>
</combo_box>
+ </layout_panel>
+ <layout_panel name="links_login_panel">
<text name="login_help">
Нужна помощь при входе?
</text>
<text name="forgot_password_text">
Забыли имя или пароль?
</text>
+ <button label="Войти" name="connect_btn"/>
+ <check_box label="Запомнить пароль" name="remember_check"/>
</layout_panel>
<layout_panel name="links">
<text name="create_account_text">
diff --git a/indra/newview/skins/default/xui/tr/panel_login.xml b/indra/newview/skins/default/xui/tr/panel_login.xml
index 2628755fe2..15684ba402 100644
--- a/indra/newview/skins/default/xui/tr/panel_login.xml
+++ b/indra/newview/skins/default/xui/tr/panel_login.xml
@@ -15,15 +15,8 @@
<text name="password_text">
Parola:
</text>
- <check_box label="Parolayı hatırla" name="remember_check"/>
- <button label="Oturum Aç" name="connect_btn"/>
- <text name="mode_selection_text">
- Mod:
- </text>
- <combo_box name="mode_combo" tool_tip="Modunuzu seçin. Hızlı, kolay keşif yapmak ve sohbet için Temel seçimini yapın. Daha fazla özelliğe erişmek için Gelişmiş seçimini yapın.">
- <combo_box.item label="Temel" name="Basic"/>
- <combo_box.item label="Gelişmiş" name="Advanced"/>
- </combo_box>
+ </layout_panel>
+ <layout_panel name="start_location_panel">
<text name="start_location_text">
Buradan başla:
</text>
@@ -32,12 +25,16 @@
<combo_box.item label="Ana Konumum" name="MyHome"/>
<combo_box.item label="&lt;Bölge adını girin&gt;" name="Typeregionname"/>
</combo_box>
+ </layout_panel>
+ <layout_panel name="links_login_panel">
<text name="login_help">
Oturum açarken yardım mı gerekiyor?
</text>
<text name="forgot_password_text">
Kullanıcı adınızı veya parolanızı mı unuttunuz?
</text>
+ <button label="Oturum Aç" name="connect_btn"/>
+ <check_box label="Parolayı hatırla" name="remember_check"/>
</layout_panel>
<layout_panel name="links">
<text name="create_account_text">
diff --git a/indra/newview/skins/default/xui/zh/panel_login.xml b/indra/newview/skins/default/xui/zh/panel_login.xml
index ef501f3f88..efd8e22bf0 100644
--- a/indra/newview/skins/default/xui/zh/panel_login.xml
+++ b/indra/newview/skins/default/xui/zh/panel_login.xml
@@ -15,15 +15,8 @@
<text name="password_text">
密碼：
</text>
- <check_box label="記住密碼：" name="remember_check"/>
- <button label="登入" name="connect_btn"/>
- <text name="mode_selection_text">
- 模式：
- </text>
- <combo_box name="mode_combo" tool_tip="請選擇你的模式。選用基本模式可以快速、簡單地探索與聊天；選用進階模式則可以使用更多功能。">
- <combo_box.item label="基本" name="Basic"/>
- <combo_box.item label="進階" name="Advanced"/>
- </combo_box>
+ </layout_panel>
+ <layout_panel name="start_location_panel">
<text name="start_location_text">
開始地點：
</text>
@@ -32,12 +25,16 @@
<combo_box.item label="我的家" name="MyHome"/>
<combo_box.item label="&lt; 請輸入地區名稱 &gt;" name="Typeregionname"/>
</combo_box>
+ </layout_panel>
+ <layout_panel name="links_login_panel">
<text name="login_help">
登入時需要幫助？
</text>
<text name="forgot_password_text">
忘記你的使用者名稱或密碼？
</text>
+ <button label="登入" name="connect_btn"/>
+ <check_box label="記住密碼：" name="remember_check"/>
</layout_panel>
<layout_panel name="links">
<text name="create_account_text">
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 14:08:59 +0000