summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermedia.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2013-01-24 14:28:09 -0500
committerNat Goodspeed <nat@lindenlab.com>2013-01-24 14:28:09 -0500
commit3b369770f7a81ca76b81087d2716c5f29211f7c2 (patch)
tree70ad9096da75c663590a546fa9f12dcfe7b11373 /indra/newview/llviewermedia.cpp
parent22db60ed0dfd606ab8f8d49141446442a4a72a48 (diff)
parentcebde0a32b4a8163010d9cbf5e6b3036865ed943 (diff)
Automated merge with ssh://bitbucket.org/lindenlab/viewer-development
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);