summaryrefslogtreecommitdiff
path: root/indra/llmessage/llhttpconstants.h
diff options
context:
space:
mode:
authorNorthspring <pantera.polnocy@phoenixviewer.com>2014-11-15 21:13:50 +0100
committerNorthspring <pantera.polnocy@phoenixviewer.com>2014-11-15 21:13:50 +0100
commitdc913aaea58ef7ce71e27dd7e49da0b10622b05e (patch)
treec9ef9a503ff9c9732c4ea5a8df1a909c73af1880 /indra/llmessage/llhttpconstants.h
parentc721f87d83a0402a62a1694a1c682053ec0f09a7 (diff)
parent2301cf800f40101baed7a5936683d0b1e4968be1 (diff)
Merge
Diffstat (limited to 'indra/llmessage/llhttpconstants.h')
-rwxr-xr-xindra/llmessage/llhttpconstants.h3
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;