From ad4102db1b0b6730d6d1fe7119cab2149bb48e2c Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 16 Oct 2012 21:13:25 -0400 Subject: 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. --- indra/newview/llpanellogin.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index c6bcaeab07..58e9a6b342 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -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(), -- cgit v1.2.3