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

LLPanelLogin::loadLoginPage() can now use "sourceid" settings var. 

Previously we borrowed the sourceid= param value from create_account_url,
which we "happened to know" was overridden with the sourceid of interest. Now
that we have a settings variable that directly captures sourceid, though, much
more straightforward to use that.
meow-7.2.2
Nat Goodspeed 2012-10-16 21:13:25 -04:00
parent 50c633bf35
commit ad4102db1b
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llpanellogin.cpp
View File

@ -771,13 +771,8 @@ void LLPanelLogin::loadLoginPage()
// add OS info
params["os"] = LLAppViewer::instance()->getOSInfo().getOSStringSimple();
// sourceid: create_account_url's sourceid= varies by skin
LLURI create_account_url(LLTrans::getString("create_account_url"));
LLSD create_account_params(create_account_url.queryMap());
if (create_account_params.has("sourceid"))
{
params["sourceid"] = create_account_params["sourceid"];
}
// sourceid
params["sourceid"] = gSavedSettings.getString("sourceid");
// Make an LLURI with this augmented info
LLURI login_uri(LLURI::buildHTTP(login_page.authority(),