summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-04-01 13:45:21 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-04-01 13:45:21 +0100
commitbb4836f53d98d987a1702f970d4b853eaa529907 (patch)
treec0d16c64f89f10cd383cbbefa1cf2a914d0dc22a /indra/newview/llstartup.cpp
parenta503cb57465594bf693ed335d04715389725b3b0 (diff)
parent68870a1f59c11a173353698b994f4540b214d57f (diff)
another hairy merge from viewer-trunk
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r--indra/newview/llstartup.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 1a1dffe85c..b5a73a3143 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -3087,6 +3087,13 @@ bool process_login_success_response()
}
}
+ // Start the process of fetching the OpenID session cookie for this user login
+ std::string openid_url = response["openid_url"];
+ if(!openid_url.empty())
+ {
+ std::string openid_token = response["openid_token"];
+ LLViewerMedia::openIDSetup(openid_url, openid_token);
+ }
bool success = false;
// JC: gesture loading done below, when we have an asset system