diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-10-28 10:01:40 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-10-28 10:01:40 -0400 |
| commit | cd0774a2174a5f5ef4871473afd175778db60980 (patch) | |
| tree | cf664f37d824005bd768a0ce9d02a45d246bd8f0 /indra/llmessage/llhttpconstants.cpp | |
| parent | 286ed4a4c2b9a0333970f4a067be751f1703b218 (diff) | |
| parent | 02e2235277a90f2e291557a429ae4e5de3e0d3b6 (diff) | |
merge changes for 3.7.19-release
Diffstat (limited to 'indra/llmessage/llhttpconstants.cpp')
| -rwxr-xr-x | indra/llmessage/llhttpconstants.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/llmessage/llhttpconstants.cpp b/indra/llmessage/llhttpconstants.cpp index 01f4a080b0..32f76f0d70 100755 --- a/indra/llmessage/llhttpconstants.cpp +++ b/indra/llmessage/llhttpconstants.cpp @@ -3,11 +3,8 @@ * @brief Implementation of the HTTP request / response constant lookups * * $LicenseInfo:firstyear=2013&license=viewerlgpl$ - * - * Copyright (c) 2013, Linden Research, Inc. - * * Second Life Viewer Source Code - * Copyright (C) 2013, Linden Research, Inc. + * Copyright (C) 2013-2014, Linden Research, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -107,6 +104,7 @@ const std::string HTTP_IN_HEADER_X_FORWARDED_FOR("x-forwarded-for"); const std::string HTTP_CONTENT_LLSD_XML("application/llsd+xml"); const std::string HTTP_CONTENT_OCTET_STREAM("application/octet-stream"); +const std::string HTTP_CONTENT_VND_LL_MESH("application/vnd.ll.mesh"); const std::string HTTP_CONTENT_XML("application/xml"); const std::string HTTP_CONTENT_JSON("application/json"); const std::string HTTP_CONTENT_TEXT_HTML("text/html"); |