merge

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");