Merge in downstream viewer-tiger

1 files changed, 11 insertions, 5 deletions

diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index 08d2d03b9b..8f50555a73 100755
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -27,8 +27,10 @@
 
 #include "llviewerprecompiledheaders.h"
 
+#include "apr_pools.h"
+#include "apr_dso.h"
+#include "llhttpconstants.h"
 #include "llapr.h"
-#include "llhttpstatuscodes.h"
 #include "llmeshrepository.h"
 
 #include "llagent.h"
@@ -515,6 +517,7 @@ S32 LLMeshRepoThread::sRequestWaterLevel = 0;
 class LLMeshHandlerBase : public LLCore::HttpHandler
 {
 public:
+	LOG_CLASS(LLMeshHandlerBase);
 	LLMeshHandlerBase()
 		: LLCore::HttpHandler(),
 		  mMeshParams(),
@@ -547,6 +550,7 @@ public:
 class LLMeshHeaderHandler : public LLMeshHandlerBase
 {
 public:
+	LOG_CLASS(LLMeshHeaderHandler);
 	LLMeshHeaderHandler(const LLVolumeParams & mesh_params)
 		: LLMeshHandlerBase()
 	{
@@ -603,6 +607,7 @@ public:
 class LLMeshSkinInfoHandler : public LLMeshHandlerBase
 	{
 public:
+	LOG_CLASS(LLMeshSkinInfoHandler);
 	LLMeshSkinInfoHandler(const LLUUID& id, U32 offset, U32 size)
 		: LLMeshHandlerBase(),
 		  mMeshID(id),
@@ -632,6 +637,7 @@ public:
 class LLMeshDecompositionHandler : public LLMeshHandlerBase
 	{
 public:
+	LOG_CLASS(LLMeshDecompositionHandler);
 	LLMeshDecompositionHandler(const LLUUID& id, U32 offset, U32 size)
 		: LLMeshHandlerBase(),
 		  mMeshID(id),
@@ -661,6 +667,7 @@ public:
 class LLMeshPhysicsShapeHandler : public LLMeshHandlerBase
 	{
 public:
+	LOG_CLASS(LLMeshPhysicsShapeHandler);
 	LLMeshPhysicsShapeHandler(const LLUUID& id, U32 offset, U32 size)
 		: LLMeshHandlerBase(),
 		  mMeshID(id),
@@ -736,7 +743,6 @@ void log_upload_error(LLCore::HttpStatus status, const LLSD& content,
 	}
 }
 
-
 LLMeshRepoThread::LLMeshRepoThread()
 : LLThread("mesh repo"),
   mHttpRequest(NULL),
@@ -1993,9 +1999,9 @@ void LLMeshUploadThread::wholeModelToLLSD(LLSD& dest, bool include_textures)
 	result["asset_type"] = "mesh";
 	result["inventory_type"] = "object";
 	result["description"] = "(No Description)";
-	result["next_owner_mask"] = LLSD::Integer(LLFloaterPerms::getNextOwnerPerms());
-	result["group_mask"] = LLSD::Integer(LLFloaterPerms::getGroupPerms());
-	result["everyone_mask"] = LLSD::Integer(LLFloaterPerms::getEveryonePerms());
+	result["next_owner_mask"] = LLSD::Integer(LLFloaterPerms::getNextOwnerPerms("Uploads"));
+	result["group_mask"] = LLSD::Integer(LLFloaterPerms::getGroupPerms("Uploads"));
+	result["everyone_mask"] = LLSD::Integer(LLFloaterPerms::getEveryonePerms("Uploads"));
 
 	res["mesh_list"] = LLSD::emptyArray();
 	res["texture_list"] = LLSD::emptyArray();