summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-04-01 10:44:07 -0400
committerLoren Shih <seraph@lindenlab.com>2010-04-01 10:44:07 -0400
commit045fb061376b25597b69d8043429d0fa25790c90 (patch)
tree6396df681e38b766f24d870f694924310042f448 /indra/newview/llstartup.cpp
parent1e8375571526c0275ef0d5dcc4860df9cdd8b68b (diff)
parent97f9dbee2ccd32b666c14bd79111bc2dbe2523e2 (diff)
automated merge
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