livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prepare for NUI login page merge phase 1: Move the current login page into the FS domain

Ansariel 2015-01-14 23:13:24 +01:00
parent 33c37433a3
commit 2efb0c3eca
25 changed files with 2605 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/CMakeLists.txt
View File

@ -180,6 +180,7 @@ set(viewer_SOURCE_FILES
fspanelclassified.cpp
fspanelcontactsets.cpp
fspanelimcontrolpanel.cpp
fspanellogin.cpp
fspanelprefs.cpp
fspanelprofile.cpp
fspanelprofileclassifieds.cpp
@ -905,6 +906,7 @@ set(viewer_HEADER_FILES
fspanelcontactsets.h
fspanelclassified.h
fspanelimcontrolpanel.h
fspanellogin.h
fspanelprefs.h
fspanelprofile.h
fspanelprofileclassifieds.h

1488
indra/newview/fspanellogin.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

136
indra/newview/fspanellogin.h Normal file
View File

@ -0,0 +1,136 @@
/**
* @file fspanellogin.h
* @brief Login username entry fields.
*
* $LicenseInfo:firstyear=2002&license=viewerlgpl$
* Second Life Viewer Source Code
* Copyright (C) 2010, Linden Research, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
// Original file: llpanellogin.cpp
#ifndef FS_PANELLOGIN_H
#define FS_PANELLOGIN_H
#include "llpanel.h"
#include "llpointer.h" // LLPointer<>
#include "llmediactrl.h" // LLMediaCtrlObserver
#include <boost/scoped_ptr.hpp>
class LLLineEditor;
class LLUIImage;
class LLPanelLoginListener;
class LLSLURL;
class LLCredential;
class FSPanelLogin:
public LLPanel,
public LLViewerMediaObserver
{
LOG_CLASS(FSPanelLogin);
public:
FSPanelLogin(const LLRect &rect,
void (*callback)(S32 option, void* user_data),
void *callback_data);
~FSPanelLogin();
virtual BOOL handleKeyHere(KEY key, MASK mask);
virtual void draw();
virtual void setFocus( BOOL b );
// Show the XUI first name, last name, and password widgets. They are
// hidden on startup for reg-in-client
static void showLoginWidgets();
static void show(const LLRect &rect,
void (*callback)(S32 option, void* user_data),
void* callback_data);
// <FS:CR>
//static void setFields(LLPointer<LLCredential> credential, BOOL remember);
static void setFields(LLPointer<LLCredential> credential);
// </FS:CR>
static void getFields(LLPointer<LLCredential>& credential, BOOL& remember);
static BOOL areCredentialFieldsDirty();
static void setLocation(const LLSLURL& slurl);
/// Call when preferences that control visibility may have changed
static void updateLocationSelectorsVisibility();
static void closePanel();
void setSiteIsAlive( bool alive );
static void loadLoginPage();
static void giveFocus();
static void setAlwaysRefresh(bool refresh);
// inherited from LLViewerMediaObserver
/*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event);
static void updateServer(); // update the combo box, change the login page to the new server, clear the combo
/// to be called from LLStartUp::setStartSLURL
static void onUpdateStartSLURL(const LLSLURL& new_start_slurl);
private:
friend class LLPanelLoginListener;
void reshapeBrowser();
void addFavoritesToStartLocation();
// <FS:CR>
//void addUsersWithFavoritesToUsername();
void addUsersToCombo(BOOL show_server);
void onSelectUser();
void onModeChange(const LLSD& original_value, const LLSD& new_value);
void onModeChangeConfirm(const LLSD& original_value, const LLSD& new_value, const LLSD& notification, const LLSD& response);
// </FS:CR>
void onSelectServer();
void onLocationSLURL();
static void onClickConnect(void*);
static void onClickNewAccount(void*);
static void onClickVersion(void*);
static void onClickForgotPassword(void*);
static void onClickHelp(void*);
static void onPassKey(LLLineEditor* caller, void* user_data);
static void updateServerCombo();
// <FS:CR>
static void onClickRemove(void*);
static void onRemoveCallback(const LLSD& notification, const LLSD& response);
static void onClickGridMgrHelp(void*);
static void gridListChanged(bool success);
static std::string credentialName();
// </FS:CR>
private:
LLPointer<LLUIImage> mLogoImage;
//boost::scoped_ptr<LLPanelLoginListener> mListener;
void (*mCallback)(S32 option, void *userdata);
void* mCallbackData;
BOOL mPasswordModified;
static FSPanelLogin* sInstance;
static BOOL sCapslockDidNotification;
};
#endif //FS_PANELLOGIN_H

27
indra/newview/llfloaterpreference.cpp
View File

@ -63,7 +63,10 @@
#include "llnotifications.h"
#include "llnotificationsutil.h"
#include "llnotificationtemplate.h"
#include "llpanellogin.h"
// <FS:Ansariel> [FS Login Panel]
//#include "llpanellogin.h"
#include "fspanellogin.h"
// </FS:Ansariel> [FS Login Panel]
#include "llpanelvoicedevicesettings.h"
#include "llradiogroup.h"
#include "llsearchcombobox.h"
@ -1053,7 +1056,10 @@ void LLFloaterPreference::onOpen(const LLSD& key)
//onNotificationsChange("ObjectIMOptions");
// </FS:CR>
LLPanelLogin::setAlwaysRefresh(true);
// <FS:Ansariel> [FS Login Panel]
//LLPanelLogin::setAlwaysRefresh(true);
FSPanelLogin::setAlwaysRefresh(true);
// </FS:Ansariel> [FS Login Panel]
refresh();
@ -1181,7 +1187,10 @@ void LLFloaterPreference::onClose(bool app_quitting)
gSavedSettings.setS32("LastPrefTab", getChild<LLTabContainer>("pref core")->getCurrentPanelIndex());
}
// </FS:Ansariel>
LLPanelLogin::setAlwaysRefresh(false);
// <FS:Ansariel> [FS Login Panel]
//LLPanelLogin::setAlwaysRefresh(false);
FSPanelLogin::setAlwaysRefresh(false);
// </FS:Ansariel> [FS Login Panel]
if (!app_quitting)
{
cancel();
@ -1251,7 +1260,10 @@ void LLFloaterPreference::onBtnOK()
LL_INFOS() << "Can't close preferences!" << LL_ENDL;
}
LLPanelLogin::updateLocationSelectorsVisibility();
// <FS:Ansariel> [FS Login Panel]
//LLPanelLogin::updateLocationSelectorsVisibility();
FSPanelLogin::updateLocationSelectorsVisibility();
// </FS:Ansariel> [FS Login Panel]
//Need to reload the navmesh if the pathing console is up
LLHandle<LLFloaterPathfindingConsole> pathfindingConsoleHandle = LLFloaterPathfindingConsole::getInstanceHandle();
if ( !pathfindingConsoleHandle.isDead() )
@ -1276,7 +1288,10 @@ void LLFloaterPreference::onBtnApply( )
apply();
saveSettings();
LLPanelLogin::updateLocationSelectorsVisibility();
// <FS:Ansariel> [FS Login Panel]
//LLPanelLogin::updateLocationSelectorsVisibility();
FSPanelLogin::updateLocationSelectorsVisibility();
// </FS:Ansariel> [FS Login Panel]
}
// static
@ -4377,7 +4392,7 @@ void LLPanelPreferenceOpensim::apply()
void LLPanelPreferenceOpensim::cancel()
{
LLGridManager::getInstance()->resetGrids();
LLPanelLogin::updateServer();
FSPanelLogin::updateServer();
}
void LLPanelPreferenceOpensim::onClickAddGrid()

15
indra/newview/llloginhandler.cpp
View File

@ -31,7 +31,10 @@
// viewer includes
#include "llsecapi.h"
#include "lllogininstance.h" // to check if logged in yet
#include "llpanellogin.h"
// <FS:Ansariel> [FS Login Panel]
//#include "llpanellogin.h"
#include "fspanellogin.h"
// </FS:Ansariel> [FS Login Panel]
#include "llstartup.h" // getStartupState()
#include "llslurl.h"
#include "llviewercontrol.h" // gSavedSettings
@ -100,7 +103,10 @@ bool LLLoginHandler::handle(const LLSD& tokens,
&& tokens[0].asString() == "show")
{
// We're using reg-in-client, so show the XUI login widgets
LLPanelLogin::showLoginWidgets();
// <FS:Ansariel> [FS Login Panel]
//LLPanelLogin::showLoginWidgets();
FSPanelLogin::showLoginWidgets();
// </FS:Ansariel> [FS Login Panel]
return true;
}
@ -144,7 +150,10 @@ bool LLLoginHandler::handle(const LLSD& tokens,
// as the login page may change from grid to grid, as well as
// things like username/password/etc, we simply refresh the
// login page to make sure everything is set up correctly
LLPanelLogin::loadLoginPage();
// <FS:Ansariel> [FS Login Panel]
//LLPanelLogin::loadLoginPage();
FSPanelLogin::loadLoginPage();
// </FS:Ansariel> [FS Login Panel]
LLStartUp::setStartupState( STATE_LOGIN_CLEANUP );
}
return true;

4
indra/newview/llpanellogin.cpp
View File

@ -26,6 +26,8 @@
#include "llviewerprecompiledheaders.h"
#if 0
#include "llpanellogin.h"
#include "lllayoutstack.h"
@ -1484,3 +1486,5 @@ void LLPanelLogin::onModeChangeConfirm(const LLSD& original_value, const LLSD& n
}
}
// </FS:CR>
#endif

4
indra/newview/llpanellogin.h
View File

@ -24,6 +24,8 @@
* $/LicenseInfo$
*/
#if 0
#ifndef LL_LLPANELLOGIN_H
#define LL_LLPANELLOGIN_H
@ -132,3 +134,5 @@ private:
};
#endif
#endif

5
indra/newview/llpanelloginlistener.cpp
View File

@ -28,6 +28,9 @@
// Precompiled header
#include "llviewerprecompiledheaders.h"
#if 0
// associated header
#include "llpanelloginlistener.h"
// STL headers
@ -49,3 +52,5 @@ void LLPanelLoginListener::onClickConnect(const LLSD&) const
{
mPanel->onClickConnect(NULL);
}
#endif

4
indra/newview/llpanelloginlistener.h
View File

@ -26,6 +26,8 @@
* $/LicenseInfo$
*/
#if 0
#if ! defined(LL_LLPANELLOGINLISTENER_H)
#define LL_LLPANELLOGINLISTENER_H
@ -45,3 +47,5 @@ private:
};
#endif /* ! defined(LL_LLPANELLOGINLISTENER_H) */
#endif

10
indra/newview/llprogressview.cpp
View File

@ -51,7 +51,10 @@
#include "llappviewer.h"
#include "llweb.h"
#include "lluictrlfactory.h"
#include "llpanellogin.h"
// <FS:Ansariel> [FS Login Panel]
//#include "llpanellogin.h"
#include "fspanellogin.h"
// </FS:Ansariel> [FS Login Panel]
LLProgressView* LLProgressView::sInstance = NULL;
LLProgressViewMini* LLProgressViewMini::sInstance = NULL;
@ -510,7 +513,10 @@ void LLProgressView::onIdle(void* user_data)
self->mFadeFromLoginTimer.getElapsedTimeF32() > FADE_TO_WORLD_TIME)
{
self->mFadeFromLoginTimer.stop();
LLPanelLogin::closePanel();
// <FS:Ansariel> [FS Login Panel]
//LLPanelLogin::closePanel();
FSPanelLogin::closePanel();
// </FS:Ansariel> [FS Login Panel]
// Nothing to do anymore.
gIdleCallbacks.deleteFunction(onIdle, user_data);

58
indra/newview/llstartup.cpp
View File

@ -124,7 +124,10 @@
#include "llkeyboard.h"
#include "llloginhandler.h" // gLoginHandler, SLURL support
#include "lllogininstance.h" // Host the login module.
#include "llpanellogin.h"
// <FS:Ansariel> [FS Login Panel]
//#include "llpanellogin.h"
#include "fspanellogin.h"
// <FS:Ansariel> [FS Login Panel]
#include "llmutelist.h"
#include "llavatarpropertiesprocessor.h"
#include "llpanelclassified.h"
@ -1089,11 +1092,14 @@ bool idle_startup()
{
// <FS:CR>
//LLPanelLogin::setFields( gUserCredential, gRememberPassword);
LLPanelLogin::setFields(gUserCredential);
FSPanelLogin::setFields(gUserCredential);
// </FS:CR>
}
display_startup();
LLPanelLogin::giveFocus();
// <FS:Ansariel> [FS Login Panel]
//LLPanelLogin::giveFocus();
FSPanelLogin::giveFocus();
// </FS:Ansariel> [FS Login Panel]
// MAINT-3231 Show first run dialog only for Desura viewer
if (gSavedSettings.getString("sourceid") == "1208_desura")
@ -1195,7 +1201,10 @@ bool idle_startup()
{
// TODO if not use viewer auth
// Load all the name information out of the login view
LLPanelLogin::getFields(gUserCredential, gRememberPassword);
// <FS:Ansariel> [FS Login Panel]
//LLPanelLogin::getFields(gUserCredential, gRememberPassword);
FSPanelLogin::getFields(gUserCredential, gRememberPassword);
// </FS:Ansariel> [FS Login Panel]
// end TODO
// HACK: Try to make not jump on login
@ -1336,7 +1345,11 @@ bool idle_startup()
{
LLSLURL slurl;
// WS: Close the Panel only, if we have DisableLoginScreens enabled. Else fade away.
if(gSavedSettings.getBOOL("FSDisableLoginScreens")) LLPanelLogin::closePanel();
if(gSavedSettings.getBOOL("FSDisableLoginScreens"))
// <FS:Ansariel> [FS Login Panel]
//LLPanelLogin::closePanel();
FSPanelLogin::closePanel();
// </FS:Ansariel> [FS Login Panel]
}
@ -2839,7 +2852,10 @@ void login_show()
gToolBarView->setVisible(FALSE);
}
LLPanelLogin::show( gViewerWindow->getWindowRectScaled(), login_callback, NULL );
// <FS:Ansariel> [FS Login Panel]
//LLPanelLogin::show( gViewerWindow->getWindowRectScaled(), login_callback, NULL );
FSPanelLogin::show( gViewerWindow->getWindowRectScaled(), login_callback, NULL );
// </FS:Ansariel> [FS Login Panel]
}
// Callback for when login screen is closed. Option 0 = connect, option 1 = quit.
@ -2867,7 +2883,10 @@ void login_callback(S32 option, void *userdata)
if (LLAppViewer::instance()->quitRequested())
{
LLPanelLogin::closePanel();
// <FS:Ansariel> [FS Login Panel]
//LLPanelLogin::closePanel();
FSPanelLogin::closePanel();
// </FS:Ansariel> [FS Login Panel]
}
return;
}
@ -2892,7 +2911,10 @@ bool first_run_dialog_callback(const LLSD& notification, const LLSD& response)
LLWeb::loadURLExternal(LLTrans::getString("create_account_url") );
}
LLPanelLogin::giveFocus();
// <FS:Ansariel> [FS Login Panel]
//LLPanelLogin::giveFocus();
FSPanelLogin::giveFocus();
// </FS:Ansariel> [FS Login Panel]
return false;
}
@ -2926,7 +2948,10 @@ bool login_alert_status(const LLSD& notification, const LLSD& response)
LL_WARNS("AppInit") << "Missing case in login_alert_status switch" << LL_ENDL;
}
LLPanelLogin::giveFocus();
// <FS:Ansariel> [FS Login Panel]
//LLPanelLogin::giveFocus();
FSPanelLogin::giveFocus();
// </FS:Ansariel> [FS Login Panel]
return false;
}
@ -3693,7 +3718,10 @@ bool LLStartUp::startLLProxy()
bool login_alert_done(const LLSD& notification, const LLSD& response)
{
LLPanelLogin::giveFocus();
// <FS:Ansariel> [FS Login Panel]
//LLPanelLogin::giveFocus();
FSPanelLogin::giveFocus();
// </FS:Ansariel> [FS Login Panel]
return false;
}
@ -3754,7 +3782,10 @@ LLSD transform_cert_args(LLPointer<LLCertificate> cert)
void general_cert_done(const LLSD& notification, const LLSD& response)
{
LLStartUp::setStartupState( STATE_LOGIN_SHOW );
LLPanelLogin::giveFocus();
// <FS:Ansariel> [FS Login Panel]
//LLPanelLogin::giveFocus();
FSPanelLogin::giveFocus();
// </FS:Ansariel> [FS Login Panel]
}
// check to see if the user wants to trust the cert.
@ -3778,7 +3809,10 @@ void trust_cert_done(const LLSD& notification, const LLSD& response)
gSavedSettings.setBOOL("AutoLogin", FALSE);
LLStartUp::setStartupState( STATE_LOGIN_SHOW );
default:
LLPanelLogin::giveFocus();
// <FS:Ansariel> [FS Login Panel]
//LLPanelLogin::giveFocus();
FSPanelLogin::giveFocus();
// </FS:Ansariel> [FS Login Panel]
break;
}

10
indra/newview/llurldispatcher.cpp
View File

@ -35,7 +35,10 @@
#include "llfloatersidepanelcontainer.h"
#include "llfloaterworldmap.h"
#include "llnotifications.h"
#include "llpanellogin.h"
// <FS:Ansariel> [FS Login Panel]
//#include "llpanellogin.h"
#include "fspanellogin.h"
// </FS:Ansariel> [FS Login Panel]
#include "llregionhandle.h"
#include "llslurl.h"
#include "llstartup.h" // gStartupState
@ -206,7 +209,10 @@ bool LLURLDispatcherImpl::dispatchRegion(const LLSLURL& slurl, const std::string
// We're at the login screen, so make sure user can see
// the login location box to know where they are going.
LLPanelLogin::setLocation(slurl);
// <FS:Ansariel> [FS Login Panel]
//LLPanelLogin::setLocation(slurl);
FSPanelLogin::setLocation(slurl);
// <FS:Ansariel> [FS Login Panel]
return true;
}
// <FS:AW hypergrid support >

10
indra/newview/llviewercontrol.cpp
View File

@ -69,7 +69,10 @@
#include "llnavigationbar.h"
#include "llfloatertools.h"
#include "llpaneloutfitsinventory.h"
#include "llpanellogin.h"
// <FS:Ansariel> [FS Login Panel]
//#include "llpanellogin.h"
#include "fspanellogin.h"
// </FS:Ansariel> [FS Login Panel]
#include "llpaneltopinfobar.h"
#include "llspellcheck.h"
#include "llslurl.h"
@ -587,7 +590,10 @@ bool handleAvatarZOffsetChanged(const LLSD& sdValue)
bool handleForceShowGrid(const LLSD& newvalue)
{
LLPanelLogin::updateServer( );
// <FS:Ansariel> [FS Login Panel]
//LLPanelLogin::updateServer( );
FSPanelLogin::updateServer( );
// </FS:Ansariel> [FS Login Panel]
return true;
}

46
indra/newview/skins/default/xui/da/panel_fs_login.xml Normal file
View File

@ -0,0 +1,46 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_login">
<panel.string name="forgot_password_url">
http://secondlife.com/account/request.php
</panel.string>
<layout_stack name="login_widgets">
<layout_panel name="login">
<text name="log_in_text">
LOG PÅ
</text>
<text name="username_text">
Brugernavn:
</text>
<combo_box name="username_combo" tool_tip="Brugernavnet du valgte da du registrerde dig, som f.eks. bobsmith12 or Steller Sunshine"/>
<text name="password_text">
Password:
</text>
</layout_panel>
<layout_panel name="start_location_panel">
<text name="start_location_text">
Start ved:
</text>
<combo_box name="start_location_combo">
<combo_box.item label="Min sidste lokation" name="MyLastLocation"/>
<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">
CREATE YǾUR ACCǾUNT
</text>
<button name="create_new_account_btn" label="Opret bruger"/>
</layout_panel>
</layout_stack>
</panel>

56
indra/newview/skins/default/xui/de/panel_fs_login.xml Normal file
View File

@ -0,0 +1,56 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_login">
<panel.string name="create_account_url">
http://de.secondlife.com/registration/
</panel.string>
<panel.string name="forgot_password_url">
http://secondlife.com/account/request.php?lang=de
</panel.string>
<layout_stack name="login_widgets">
<layout_panel name="login">
<text name="log_in_text">
ANMELDEN
</text>
<text name="username_text">
Benutzername:
</text>
<combo_box name="username_combo" tool_tip="Bei der Registrierung gewählter Benutzername wie „berndschmidt12“ oder „Liebe Sonne“"/>
<icon tool_tip="Diesen Benutzernamen löschen" name="remove_user_btn"/>
<text name="password_text">
Kennwort:
</text>
</layout_panel>
<layout_panel name="start_location_panel">
<text name="start_location_text">
Hier starten:
</text>
<combo_box name="start_location_combo">
<combo_box.item label="Mein letzter Standort" name="MyLastLocation"/>
<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="grid_panel">
<text name="grid_login_text">
Gridauswahl:
</text>
</layout_panel>
<layout_panel name="links_login_panel">
<text name="create_new_account_text">
Registrieren
</text>
<text name="forgot_password_text">
Benutzernamen oder Kennwort vergessen?
</text>
<button label="Anmelden" name="connect_btn"/>
<check_box label="Kennwort speichern" name="remember_check"/>
</layout_panel>
<layout_panel name="mode_selection">
<text name="mode_selection_text">
MODUS-WAHL
</text>
<combo_box name="mode_combo" tool_tip="Wählen Sie welcher Viewer Style ihnen am meisten vertraut ist, um die Standards ihren bedürfnissen anzupassen.">
</combo_box>
</layout_panel>
</layout_stack>
</panel>

302
indra/newview/skins/default/xui/en/panel_fs_login.xml Normal file
View File

@ -0,0 +1,302 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
follows="all"
height="600"
layout="topleft"
left="0"
name="panel_login"
focus_root="true"
top="600"
width="1130">
<panel.string
name="real_url" translate="false">
http://phoenixviewer.com/app/loginV3/
</panel.string>
<string name="reg_in_client_url" translate="false">
http://secondlife.eniac15.lindenlab.com/reg-in-client/
</string>
<panel.string
name="forgot_password_url">
http://secondlife.com/account/request.php
</panel.string>
<!-- *NOTE: Custom resize logic for login_html in llpanellogin.cpp -->
<web_browser
tab_stop="false"
trusted_content="true"
bg_opaque_color="Black"
border_visible="false"
bottom="600"
follows="all"
left="0"
name="login_html"
start_url=""
top="0"
height="600"
width="996"/>
<layout_stack
animate="false"
clip="false"
follows="left|bottom|right"
name="login_widgets"
layout="topleft"
orientation="horizontal"
top="519"
width="1130"
height="80">
<layout_panel
auto_resize="false"
follows="left|bottom"
name="login"
layout="topleft"
width="335"
min_width="335"
height="80">
<text
follows="left|bottom"
font="SansSerif"
font.style="BOLD"
font.size="Large"
height="16"
name="log_in_text"
top="8"
left="15"
width="150">
LOG IN
</text>
<text
follows="left|bottom"
font="SansSerifSmall"
height="16"
name="username_text"
top="35"
left="15"
width="150">
Username:
</text>
<button
follows="left|bottom"
height="18"
image_unselected="TrashItem_Off"
image_selected="TrashItem_Press"
image_pressed="TrashItem_Press"
tool_tip="Remove this username"
label=""
layout="topleft"
name="remove_user_btn"
left="195"
top_pad="0"
width="18" />
<combo_box
allow_text_entry="true"
follows="left|bottom"
height="22"
left="15"
max_chars="128"
combo_editor.commit_on_focus_lost="false"
combo_editor.prevalidate_callback="ascii"
tool_tip="The account name you chose when you registered, like bobsmith420 or Steller Sunshine"
top_delta="0"
name="username_combo"
width="178">
<!-- empirically, displayed width is 150 anyway?!? -->
<!--<combo_box.combo_button
visible ="false"/>
<combo_box.drop_down_button
visible ="false"/>-->
</combo_box>
<!-- left="175" based on actual "username_combo" width of 150 vs. 178 -->
<text
follows="left|bottom"
font="SansSerifSmall"
height="16"
name="password_text"
top="35"
left="217"
width="128">
Password:
</text>
<!-- The max length might be changed in LLPanelLogin.cpp for Opensim! -->
<line_editor
follows="left|bottom"
height="22"
max_length_bytes="16"
name="password_edit"
is_password="true"
select_on_focus="true"
commit_on_focus_lost="false"
top_pad="0"
width="128" />
</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="10"
name="start_location_text"
top="35"
width="130">
Start at:
</text>
<combo_box
allow_text_entry="true"
control_name="NextLoginLocation"
follows="left|bottom"
height="22"
max_chars="128"
top_pad="0"
name="start_location_combo"
width="165">
<combo_box.item
label="Last location"
name="MyLastLocation"
value="last" />
<combo_box.item
label="Home"
name="MyHome"
value="home" />
<combo_box.item
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">
<text
follows="left|bottom"
font="SansSerifSmall"
height="16"
name="grid_login_text"
top="35"
left="10"
width="128">
Log into Grid:
</text>
<combo_box
allow_text_entry="false"
font="SansSerifSmall"
follows="left|right|bottom"
height="23"
max_chars="256"
left="10"
top="51"
layout="topleft"
top_pad="2"
name="server_combo"
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="10"
height="16"
name="create_new_account_text"
top="10"
width="280">
Create an account
</text>
<text
follows="left|bottom"
font="SansSerifSmall"
text_color="EmphasisColor"
height="16"
name="forgot_password_text"
top="26"
width="280">
Forgot your username or password?
</text>
<button
follows="left|bottom"
top_pad="9"
height="23"
label="Log In"
layout="topleft"
name="connect_btn"
width="90" />
<check_box
control_name="RememberPassword"
follows="left|bottom"
font="SansSerifSmall"
left="110"
top="56"
height="16"
label="Remember password"
top_pad="3"
name="remember_check"
width="145" />
</layout_panel>
<layout_panel
tab_stop="false"
follows="right|bottom"
name="mode_selection"
width="210"
min_width="100"
height="80">
<text
follows="right|bottom"
font="SansSerif"
font.style="BOLD"
font.size="Large"
halign="right"
height="16"
name="mode_selection_text"
top="8"
right="-15"
width="200">
SELECT MODE
</text>
<combo_box
follows="right|bottom"
top="35"
left_pad="10"
right="-15"
height="23"
max_chars="128"
tool_tip="Select which style of viewer you are most familiar with to set your defaults to appropriately."
name="mode_combo"
width="110">
<combo_box.item
label="Firestorm"
name="Firestorm"
value="settings_firestorm.xml" />
<combo_box.item
label="Phoenix"
name="Phoenix"
value="settings_phoenix.xml" />
<combo_box.item
label="Viewer 3"
name="V3"
value="settings_v3.xml" />
<combo_box.item
label="Hybrid"
name="Hybrid"
value="settings_hybrid.xml" />
<combo_box.item
label="Latency"
name="Latency"
value="settings_latency.xml" />
</combo_box>
</layout_panel>
</layout_stack>
</panel>

57
indra/newview/skins/default/xui/es/panel_fs_login.xml Normal file
View File

@ -0,0 +1,57 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_login">
<panel.string name="forgot_password_url">
https://secondlife.com/my/account/request.php?lang=es-ES
</panel.string>
<layout_stack name="login_widgets">
<layout_panel name="login">
<text name="log_in_text">
CONECTAR
</text>
<text name="username_text">
Nombre de usuario:
</text>
<button tool_tip="Eliminar este usuario" name="remove_user_btn"/>
<combo_box name="username_combo" tool_tip="El nombre de usuario que elegiste al registrarte, como bobsmith420 o Steller Sunshine"/>
<text name="password_text">
Contraseña:
</text>
</layout_panel>
<layout_panel name="start_location_panel">
<text name="start_location_text">
Iniciar en:
</text>
<combo_box name="start_location_combo">
<combo_box.item label="Mi última posición" name="MyLastLocation"/>
<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="grid_panel">
<text name="grid_login_text">
Iniciar en la red:
</text>
</layout_panel>
<layout_panel name="links_login_panel">
<text name="create_new_account_text">
Registrarme
</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="mode_selection">
<text name="mode_selection_text">
SELECCIONAR MODO:
</text>
<combo_box name="mode_combo" tool_tip="Selecciona con qué estilo de visor estás más familiarizado para establecer tus opciones por defecto apropiadamente.">
<combo_box.item label="Firestorm" name="Firestorm"/>
<combo_box.item label="Phoenix" name="Phoenix"/>
<combo_box.item label="Viewer 3" name="V3"/>
<combo_box.item label="Híbrido" name="Hybrid"/>
</combo_box>
</layout_panel>
</layout_stack>
</panel>

53
indra/newview/skins/default/xui/fr/panel_fs_login.xml Normal file
View File

@ -0,0 +1,53 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<!--alba-->
<panel name="panel_login">
<panel.string name="create_account_url">
http://fr.secondlife.com/registration/
</panel.string>
<panel.string name="forgot_password_url">
http://secondlife.com/account/request.php?lang=fr
</panel.string>
<layout_stack name="login_widgets">
<layout_panel name="login">
<text name="username_text">
Nom d&apos;utilisateur :
</text>
<combo_box name="username_combo" tool_tip="Nom d&apos;utilisateur que vous avez choisi lors de votre inscription (par exemple, bobsmith12 ou Steller Sunshine)."/>
<button label="Supprimer ce nom" name="delete_saved_login_btn"/>
<text name="password_text">
Mot de passe :
</text>
<check_box label="Enregistrer le mdp" 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>
<text name="start_location_text">
Point d'entrée :
</text>
<combo_box name="start_location_combo">
<combo_box.item label="Dernier emplacement" name="MyLastLocation"/>
<combo_box.item label="Domicile" name="MyHome"/>
<combo_box.item label="&lt;Saisir le nom de la région&gt;" name="Typeregionname"/>
</combo_box>
<text name="grid_selection_text">
Grille :
</text>
</layout_panel>
<layout_panel name="links">
<text name="create_new_account_text">
S&apos;inscrire
</text>
<text name="forgot_password_text">
Nom d&apos;utilisateur ou mot de passe oublié ?
</text>
<text name="login_help">
Besoin d&apos;aide ?
</text>
</layout_panel>
</layout_stack>
</panel>

51
indra/newview/skins/default/xui/it/panel_fs_login.xml Normal file
View File

@ -0,0 +1,51 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_login">
<panel.string name="forgot_password_url">
http://secondlife.com/account/request.php?lang=it
</panel.string>
<layout_stack name="login_widgets">
<layout_panel name="login">
<text name="log_in_text">
ACCEDI
</text>
<text name="username_text">
Nome utente:
</text>
<combo_box name="username_combo" tool_tip="Il nome utente che hai scelto durante la registrazione, come robby12 o Stella Soleggiato"/>
<button label="Rimuovi questo utente" name="delete_saved_login_btn"/>
<text name="password_text">
Password:
</text>
</layout_panel>
<layout_panel name="start_location_panel">
<text name="start_location_text">
Inizia da:
</text>
<combo_box name="start_location_combo">
<combo_box.item label="La mia ultima ubicazione" name="MyLastLocation"/>
<combo_box.item label="Casa mia" name="MyHome"/>
<combo_box.item label="&lt;Scrivi nome regione&gt;" name="Typeregionname"/>
</combo_box>
<text name="grid_selection_text">
Accedi alla Grid:
</text>
<button label="Gestisci Grid" name="grids_btn"/>
</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">
CREA IL TUO ACCOUNT
</text>
<button label="Inizia adesso" name="create_new_account_btn"/>
</layout_panel>
</layout_stack>
</panel>

59
indra/newview/skins/default/xui/ja/panel_fs_login.xml Normal file
View File

@ -0,0 +1,59 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_login">
<panel.string name="forgot_password_url">
http://secondlife.com/account/request.php?lang=ja
</panel.string>
<layout_stack name="login_widgets">
<layout_panel name="login">
<text name="log_in_text">
ログイン
</text>
<text name="username_text">
ユーザーネーム：
</text>
<combo_box name="username_combo" tool_tip="登録時に自分で選んだユーザー名（例：bobsmith12、Steller Sunshineなど）"/>
<button label="入力内容を消去" name="delete_saved_login_btn" />
<text name="password_text">
パスワード：
</text>
</layout_panel>
<layout_panel name="start_location_panel">
<text name="start_location_text">
開始地点：
</text>
<combo_box name="start_location_combo">
<combo_box.item label="最後にログアウトした場所" name="MyLastLocation"/>
<combo_box.item label="ホーム" name="MyHome"/>
<combo_box.item label="＜地域名を入力＞" name="Typeregionname"/>
</combo_box>
</layout_panel>
<layout_panel name="grid_panel">
<text name="grid_login_text">
グリッド選択:
</text>
<combo_box name="server_combo" />
</layout_panel>
<layout_panel name="links_login_panel">
<text name="create_new_account_text">
アカウント作成
</text>
<text name="forgot_password_text">
ユーザー名またはパスワードをお忘れですか？
</text>
<button label="ログイン" name="connect_btn" />
<check_box label="パスワードを記憶" name="remember_check" />
</layout_panel>
<layout_panel name="mode_selection">
<text name="mode_selection_text">
モード選択
</text>
<combo_box tool_tip="基本設定を適切に行うために、一番慣れているビューワのタイプを選択して下さい。" name="mode_combo">
<combo_box.item label="Firestorm" name="Firestorm" value="settings_firestorm.xml" />
<combo_box.item label="Phoenix" name="Phoenix" value="settings_phoenix.xml" />
<combo_box.item label="Viewer 3" name="V3" value="settings_v3.xml" />
<combo_box.item label="Hybrid" name="Hybrid" value="settings_hybrid.xml" />
<combo_box.item label="Latency" name="Latency" value="settings_latency.xml" />
</combo_box>
</layout_panel>
</layout_stack>
</panel>

51
indra/newview/skins/default/xui/pl/panel_fs_login.xml Normal file
View File

@ -0,0 +1,51 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_login">
<layout_stack name="login_widgets">
<layout_panel name="login">
<text name="log_in_text">
ZALOGUJ SIĘ
</text>
<text name="username_text">
Użytkownik:
</text>
<button tool_tip="Usuń tą nazwę użytkownika" name="remove_user_btn"/>
<combo_box name="username_combo" tool_tip="Nazwa użytkownika wybrana przy rejestracji, np. bobsmith12 lub Steller Sunshine"/>
<text name="password_text">
Hasło:
</text>
</layout_panel>
<layout_panel name="start_location_panel">
<text name="start_location_text">
Rozpocznij w:
</text>
<combo_box name="start_location_combo">
<combo_box.item label="Ostatnia lokalizacja" name="MyLastLocation"/>
<combo_box.item label="Moje Miejsce Startu" name="MyHome"/>
<combo_box.item label="&lt;Wpisz nazwę regionu&gt;" name="Typeregionname"/>
</combo_box>
</layout_panel>
<layout_panel name="grid_panel">
<text name="grid_login_text">
Loguj na siatkę:
</text>
</layout_panel>
<layout_panel name="links_login_panel">
<text name="create_new_account_text">
Utwórz nowe konto
</text>
<text name="forgot_password_text">
Zapomniałeś/aś nazwy lub hasła?
</text>
<button label="Zaloguj" name="connect_btn"/>
<check_box label="Zapamiętaj hasło" name="remember_check"/>
</layout_panel>
<layout_panel name="mode_selection">
<text name="mode_selection_text">
WYBIERZ TRYB
</text>
<combo_box name="mode_combo" tool_tip="Wybierz ten tryb ustawień, z którym jesteś najbardziej obeznany/a, aby Firestorm mógł dobrać odpowiednie ustawienia domyślne.">
<combo_box.item label="Hybrydowy" name="Hybrid"/>
</combo_box>
</layout_panel>
</layout_stack>
</panel>

46
indra/newview/skins/default/xui/pt/panel_fs_login.xml Normal file
View File

@ -0,0 +1,46 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_login">
<panel.string name="forgot_password_url">
http://secondlife.com/account/request.php?lang=pt
</panel.string>
<layout_stack name="login_widgets">
<layout_panel name="login">
<text name="log_in_text">
LOGIN
</text>
<text name="username_text">
Nome de usuário:
</text>
<combo_box name="username_combo" tool_tip="O nome de usuário que você escolheu ao fazer seu cadastro, como zecazc12 or Magia Solar"/>
<text name="password_text">
Senha:
</text>
</layout_panel>
<layout_panel name="start_location_panel">
<text name="start_location_text">
Começar em:
</text>
<combo_box name="start_location_combo">
<combo_box.item label="Última posição" name="MyLastLocation"/>
<combo_box.item label="Minha casa" name="MyHome"/>
<combo_box.item label="&lt;Digite o nome da região&gt;" name="Typeregionname"/>
</combo_box>
</layout_panel>
<layout_panel name="links_login_panel">
<text name="login_help">
Precisa de ajuda com o login?
</text>
<text name="forgot_password_text">
Esqueceu seu nome ou senha?
</text>
<button label="Login" name="connect_btn"/>
<check_box label="Lembrar senha" name="remember_check"/>
</layout_panel>
<layout_panel name="links">
<text name="create_account_text">
CRIE SUA CONTA
</text>
<button label="Comece agora" name="create_new_account_btn"/>
</layout_panel>
</layout_stack>
</panel>

46
indra/newview/skins/default/xui/ru/panel_fs_login.xml Normal file
View File

@ -0,0 +1,46 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_login">
<panel.string name="forgot_password_url">
http://secondlife.com/account/request.php
</panel.string>
<layout_stack name="login_widgets">
<layout_panel name="login">
<text name="log_in_text">
ВОЙТИ
</text>
<text name="username_text">
Имя пользователя:
</text>
<combo_box name="username_combo" tool_tip="Имя пользователя, которое вы выбрали при регистрации, например, «bobsmith12» или «Steller Sunshine»"/>
<text name="password_text">
Пароль:
</text>
</layout_panel>
<layout_panel name="start_location_panel">
<text name="start_location_text">
Место старта:
</text>
<combo_box name="start_location_combo">
<combo_box.item label="Последнее местоположение" name="MyLastLocation"/>
<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">
СОЗДАЙТЕ СВОЙ АККАУНТ
</text>
<button label="Начать" name="create_new_account_btn"/>
</layout_panel>
</layout_stack>
</panel>

46
indra/newview/skins/default/xui/tr/panel_fs_login.xml Normal file
View File

@ -0,0 +1,46 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_login">
<panel.string name="forgot_password_url">
http://secondlife.com/account/request.php
</panel.string>
<layout_stack name="login_widgets">
<layout_panel name="login">
<text name="log_in_text">
OTURUM AÇ
</text>
<text name="username_text">
Kullanıcı Adı:
</text>
<combo_box name="username_combo" tool_tip="Kaydolduğunuzda seçtiğiniz kullanıcı adı, örn. mustafayalcin12 veya Faruk Gungoren"/>
<text name="password_text">
Parola:
</text>
</layout_panel>
<layout_panel name="start_location_panel">
<text name="start_location_text">
Buradan başla:
</text>
<combo_box name="start_location_combo">
<combo_box.item label="Son konumum" name="MyLastLocation"/>
<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">
HESABINIZI OLUŞTURUN
</text>
<button label="Şimdi başla" name="create_new_account_btn"/>
</layout_panel>
</layout_stack>
</panel>

46
indra/newview/skins/default/xui/zh/panel_fs_login.xml Normal file
View File

@ -0,0 +1,46 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_login">
<panel.string name="forgot_password_url">
http://secondlife.com/account/request.php
</panel.string>
<layout_stack name="login_widgets">
<layout_panel name="login">
<text name="log_in_text">
登入
</text>
<text name="username_text">
使用者名稱：
</text>
<combo_box name="username_combo" tool_tip="使用者名稱是你註冊時所挑選的，像是 bobsmith12 或 Steller Sunshine"/>
<text name="password_text">
密碼：
</text>
</layout_panel>
<layout_panel name="start_location_panel">
<text name="start_location_text">
開始地點：
</text>
<combo_box name="start_location_combo">
<combo_box.item label="我上一次位置" name="MyLastLocation"/>
<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">
建立你的帳號
</text>
<button label="現在就開始" name="create_new_account_btn"/>
</layout_panel>
</layout_stack>
</panel>