summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLynx Linden <lynx@lindenlab.com>2010-02-17 11:54:27 +0000
committerLynx Linden <lynx@lindenlab.com>2010-02-17 11:54:27 +0000
commitf6304197a755b4268e65d128c2695d6392d2bffd (patch)
treecb9fcceb6d72eaad1a292abea123bc3b8230a8c3
parentcb460174daa479dd65e3c97840bee694a68e8c0f (diff)
EXT-4882: Added firstlogin query param to Home website.
Url substitutions now support a [FIRST_LOGIN] parameter that returns the value of gAgent.isFirstLogin(). This now gets passed to the Home sidetray web site as a firstlogin query param.
-rw-r--r--indra/newview/app_settings/settings.xml2
-rw-r--r--indra/newview/llweb.cpp1
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 3f2767f54b..000c63d22c 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3607,7 +3607,7 @@
<key>Type</key>
<string>String</string>
<key>Value</key>
- <string>https://viewer-sidebar.secondlife.com/sidebar.html?p=[AUTH_TOKEN]&amp;lang=[LANGUAGE]&amp;channel=[CHANNEL]&amp;version=[VERSION]&amp;major=[VERSION_MAJOR]&amp;minor=[VERSION_MINOR]</string>
+ <string>https://viewer-sidebar.secondlife.com/sidebar.html?p=[AUTH_TOKEN]&amp;lang=[LANGUAGE]&amp;channel=[CHANNEL]&amp;version=[VERSION]&amp;major=[VERSION_MAJOR]&amp;minor=[VERSION_MINOR]&amp;firstlogin=[FIRST_LOGIN]</string>
</map>
<key>SearchURL</key>
<map>
diff --git a/indra/newview/llweb.cpp b/indra/newview/llweb.cpp
index 100ec0bb69..3385b75c65 100644
--- a/indra/newview/llweb.cpp
+++ b/indra/newview/llweb.cpp
@@ -148,6 +148,7 @@ std::string LLWeb::expandURLSubstitutions(const std::string &url,
substitution["GRID"] = LLViewerLogin::getInstance()->getGridLabel();
substitution["OS"] = LLAppViewer::instance()->getOSInfo().getOSStringSimple();
substitution["SESSION_ID"] = gAgent.getSessionID();
+ substitution["FIRST_LOGIN"] = gAgent.isFirstLogin();
// work out the current language
std::string lang = LLUI::getLanguage();