diff options
author | Oz Linden <oz@lindenlab.com> | 2013-01-09 15:18:20 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-01-09 15:18:20 -0500 |
commit | cdd45b9abb35b40f2a31e7433fb99e588df8b40b (patch) | |
tree | f59f5e404f8417c8fea632592b7256c2f677b399 /indra/newview/llviewermedia.cpp | |
parent | bf55755262244c7c36df781d2e093b4109f6ecbf (diff) | |
parent | 42a33b6c6250aca7e459f95cd13b0d0600cd6262 (diff) |
merge changes for DRTVWR-276
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
-rw-r--r-- | indra/newview/llviewermedia.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 47059b0b8c..2df028de69 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -316,9 +316,13 @@ public: /* virtual */ void completedHeader(U32 status, const std::string& reason, const LLSD& content) { LL_WARNS("MediaAuth") << "status = " << status << ", reason = " << reason << LL_ENDL; - LL_WARNS("MediaAuth") << content << LL_ENDL; + + LLSD stripped_content = content; + stripped_content.erase("set-cookie"); + LL_WARNS("MediaAuth") << stripped_content << LL_ENDL; std::string cookie = content["set-cookie"].asString(); + LL_DEBUGS("MediaAuth") << "cookie = " << cookie << LL_ENDL; LLViewerMedia::getCookieStore()->setCookiesFromHost(cookie, mHost); |