summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermedia.h
diff options
context:
space:
mode:
authorcallum_linden <none@none>2015-10-20 14:44:36 -0700
committercallum_linden <none@none>2015-10-20 14:44:36 -0700
commitc16e726d0e2a8c607ce441eb5bf2419b16b41cab (patch)
tree871cafe6ac47a75437e852868a066557d128026b /indra/newview/llviewermedia.h
parent2a899b49dd5d0a4ff4b4ab2e36bda48ff1473f0a (diff)
MAINT-5711 FIX2 auto login for profiles - final part retrieves the URL to set cookie for
from the message sent over by login.cgi
Diffstat (limited to 'indra/newview/llviewermedia.h')
-rwxr-xr-xindra/newview/llviewermedia.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h
index 0101c85e79..45d211f232 100755
--- a/indra/newview/llviewermedia.h
+++ b/indra/newview/llviewermedia.h
@@ -150,7 +150,7 @@ public:
static void removeCookie(const std::string &name, const std::string &domain, const std::string &path = std::string("/") );
static void openIDSetup(const std::string &openid_url, const std::string &openid_token);
- static void openIDCookieResponse(const std::string &cookie);
+ static void openIDCookieResponse(const std::string& url, const std::string &cookie);
static void proxyWindowOpened(const std::string &target, const std::string &uuid);
static void proxyWindowClosed(const std::string &uuid);
@@ -164,7 +164,7 @@ public:
private:
static bool parseRawCookie(const std::string raw_cookie, std::string& name, std::string& value, std::string& path);
- static void setOpenIDCookie();
+ static void setOpenIDCookie(const std::string& url);
static void onTeleportFinished();
static LLPluginCookieStore *sCookieStore;