From dc580b3a0af5528329052f014a80365e3c34c353 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Mon, 18 Jun 2018 12:49:11 +0300
Subject: [PATCH] MAINT-8751 Add a link to create an account to the viewer
login screen
---
indra/newview/llpanellogin.cpp | 13 +++++++++++++
indra/newview/llpanellogin.h | 1 +
.../skins/default/xui/en/panel_login.xml | 17 ++++++++++++++++-
.../skins/default/xui/en/panel_login_first.xml | 15 +++++++++++++++
4 files changed, 45 insertions(+), 1 deletion(-)
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index ef5ce155b1f..142dea83e2d 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -204,6 +204,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
// change z sort of clickable text to be behind buttons
sendChildToBack(getChildView("forgot_password_text"));
+ sendChildToBack(getChildView("sign_up_text"));
LLComboBox* favorites_combo = getChild<LLComboBox>("start_location_combo");
updateLocationSelectorsVisibility(); // separate so that it can be called from preferences
@@ -271,6 +272,9 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
LLTextBox* forgot_password_text = getChild<LLTextBox>("forgot_password_text");
forgot_password_text->setClickedCallback(onClickForgotPassword, NULL);
+ LLTextBox* sign_up_text = getChild<LLTextBox>("sign_up_text");
+ sign_up_text->setClickedCallback(onClickSignUp, NULL);
+
// get the web browser control
LLMediaCtrl* web_browser = getChild<LLMediaCtrl>("login_html");
web_browser->addObserver(this);
@@ -921,6 +925,15 @@ void LLPanelLogin::onClickForgotPassword(void*)
}
}
+//static
+void LLPanelLogin::onClickSignUp(void*)
+{
+ if (sInstance)
+ {
+ LLWeb::loadURLExternal(sInstance->getString("sign_up_url"));
+ }
+}
+
// static
void LLPanelLogin::onPassKey(LLLineEditor* caller, void* user_data)
{
diff --git a/indra/newview/llpanellogin.h b/indra/newview/llpanellogin.h
index 852195b304b..c633582d898 100644
--- a/indra/newview/llpanellogin.h
+++ b/indra/newview/llpanellogin.h
@@ -99,6 +99,7 @@ class LLPanelLogin:
static void onClickNewAccount(void*);
static void onClickVersion(void*);
static void onClickForgotPassword(void*);
+ static void onClickSignUp(void*);
static void onPassKey(LLLineEditor* caller, void* user_data);
static void updateServerCombo();
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 3a34bcbe21c..7759d4fdb29 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -12,6 +12,10 @@
name="forgot_password_url">
http://secondlife.com/account/request.php
</panel.string>
+ <panel.string
+ name="sign_up_url">
+ https://join.secondlife.com/
+ </panel.string>
<layout_stack
follows="left|right|top"
height="172"
@@ -149,7 +153,18 @@
label="Select grid"
layout="topleft"
name="server_combo"
- width="149" />
+ width="149" />
+ <text
+ follows="left|top"
+ font="SansSerifMedium"
+ text_color="EmphasisColor"
+ height="16"
+ name="sign_up_text"
+ left="778"
+ bottom_delta="-10"
+ width="200">
+ Sign up
+ </text>
</layout_panel>
<layout_panel
height="172"
diff --git a/indra/newview/skins/default/xui/en/panel_login_first.xml b/indra/newview/skins/default/xui/en/panel_login_first.xml
index 35b80c56abe..213f9a6b0cc 100644
--- a/indra/newview/skins/default/xui/en/panel_login_first.xml
+++ b/indra/newview/skins/default/xui/en/panel_login_first.xml
@@ -12,6 +12,10 @@
name="forgot_password_url">
http://secondlife.com/account/request.php
</panel.string>
+ <panel.string
+ name="sign_up_url">
+ https://join.secondlife.com/
+ </panel.string>
<layout_stack
follows="left|right|top|bottom"
width="1024"
@@ -168,6 +172,17 @@
width="200">
Forgotten password
</text>
+ <text
+ follows="left|top"
+ font="SansSerifLarge"
+ text_color="EmphasisColor"
+ height="16"
+ name="sign_up_text"
+ left="432"
+ top="34"
+ width="200">
+ Sign up
+ </text>
</layout_panel>
<layout_panel
height="100"
--
GitLab