summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermedia.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-01-30 20:01:03 -0800
committerMerov Linden <merov@lindenlab.com>2013-01-30 20:01:03 -0800
commitfaae38daaaf30fd96b217316cf3eafb095ff35bc (patch)
treee73c2991dcfffa2c4d4260fff6102d65be1e1312 /indra/newview/llviewermedia.cpp
parent6af899f19e246c7fe4faa1edcdfbcfe9f01dbd25 (diff)
parente7c0f69c8e0509d822c6f7410bc0d5bb10fde522 (diff)
Pull merge from lindenlab/viewer-developement
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
-rw-r--r--indra/newview/llviewermedia.cpp6
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);