diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2009-12-17 11:11:45 -0800 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2009-12-17 11:11:45 -0800 |
| commit | 0f7e49dea1dceacbf5c1e1fe2e047c2e18a59cf7 (patch) | |
| tree | a4b30ae3dd4977b21159916c7a58c28e943ade0f | |
| parent | 1f377c6b53346b419df8874cfdf8bb4c33f7b6d5 (diff) | |
Set an explicit "Accept" header when doing the MIME type probe. This prevents LLHTTPClient from adding an "Accept: application/llsd+xml", which is just wrong.
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 7bcc601705..1258bce151 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -1653,7 +1653,12 @@ void LLViewerMediaImpl::navigateInternal() if(scheme.empty() || "http" == scheme || "https" == scheme) { - LLHTTPClient::getHeaderOnly( mMediaURL, new LLMimeDiscoveryResponder(this), 10.0f); + // If we don't set an Accept header, LLHTTPClient will add one like this: + // Accept: application/llsd+xml + // which is really not what we want. + LLSD headers = LLSD::emptyMap(); + headers["Accept"] = "*/*"; + LLHTTPClient::getHeaderOnly( mMediaURL, new LLMimeDiscoveryResponder(this), headers, 10.0f); } else if("data" == scheme || "file" == scheme || "about" == scheme) { |