diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-06-16 11:42:37 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-06-16 11:42:37 -0400 |
| commit | e15002a11cf5081e0697065cb017ba0af6c4b32d (patch) | |
| tree | d60ac6d3a85d114b7860e42be5d9ff3338a6a169 /indra/newview/llmeshrepository.cpp | |
| parent | 78be5c3aa5f7263698bec5bcbccb24c150f78d09 (diff) | |
| parent | 977476171ddcc057d7c28b6c14ae988b8189ed75 (diff) | |
merge changes for 3.7.9-release
Diffstat (limited to 'indra/newview/llmeshrepository.cpp')
| -rwxr-xr-x | indra/newview/llmeshrepository.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index e298e06cb5..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), |