diff options
| author | simon <none@none> | 2014-11-03 18:02:49 -0800 |
|---|---|---|
| committer | simon <none@none> | 2014-11-03 18:02:49 -0800 |
| commit | 3b50cdd74c5870d3268ed30e342f13cf188a7841 (patch) | |
| tree | 9cae9119e97248beaacf4b19ff8056a2a4167142 /indra/llmessage/llhttpconstants.h | |
| parent | 0ffecdcfb203852a8f4a392331a5d177f8480bdd (diff) | |
| parent | fa7610fea599a98cc6e79d3835a14f8e5ca2b6b1 (diff) | |
Merge downstream code and become 3.7.20
Diffstat (limited to 'indra/llmessage/llhttpconstants.h')
| -rwxr-xr-x | indra/llmessage/llhttpconstants.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llmessage/llhttpconstants.h b/indra/llmessage/llhttpconstants.h index 4aa3cc6394..d6bcbd3c19 100755 --- a/indra/llmessage/llhttpconstants.h +++ b/indra/llmessage/llhttpconstants.h @@ -4,7 +4,7 @@ * * $LicenseInfo:firstyear=2001&license=viewerlgpl$ * Second Life Viewer Source Code - * Copyright (C) 2001-2013, Linden Research, Inc. + * Copyright (C) 2001-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 @@ -203,6 +203,7 @@ extern const std::string HTTP_IN_HEADER_X_FORWARDED_FOR; extern const std::string HTTP_CONTENT_LLSD_XML; extern const std::string HTTP_CONTENT_OCTET_STREAM; +extern const std::string HTTP_CONTENT_VND_LL_MESH; extern const std::string HTTP_CONTENT_XML; extern const std::string HTTP_CONTENT_JSON; extern const std::string HTTP_CONTENT_TEXT_HTML; |