diff options
| author | callum_linden <none@none> | 2016-05-19 11:00:03 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2016-05-19 11:00:03 -0700 |
| commit | 9c4ed8d1138de86041b740139c4deec1bc6bf8ee (patch) | |
| tree | d7452bc7faeae01964f13faaa16e2812b27ba93c /indra/newview/llmeshrepository.cpp | |
| parent | e6fb7564b02ba73c8a402efaca65cb944ce7bef2 (diff) | |
| parent | c2ef3b4c7186dbbd95b16520f281b7d58364fb52 (diff) | |
Automated merge with tip of viewer-release to pick up 4.0.5
Diffstat (limited to 'indra/newview/llmeshrepository.cpp')
| -rw-r--r--[-rwxr-xr-x] | indra/newview/llmeshrepository.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index e42367ad9e..0aaed3e286 100755..100644 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -3122,7 +3122,10 @@ void LLMeshLODHandler::processData(LLCore::BufferArray * /* body */, S32 /* body LLMeshSkinInfoHandler::~LLMeshSkinInfoHandler() { - llassert(mProcessed); + if (!mProcessed) + { + LL_WARNS(LOG_MESH) << "deleting unprocessed request handler (may be ok on exit)" << LL_ENDL; + } } void LLMeshSkinInfoHandler::processFailure(LLCore::HttpStatus status) @@ -3166,7 +3169,10 @@ void LLMeshSkinInfoHandler::processData(LLCore::BufferArray * /* body */, S32 /* LLMeshDecompositionHandler::~LLMeshDecompositionHandler() { - llassert(mProcessed); + if (!mProcessed) + { + LL_WARNS(LOG_MESH) << "deleting unprocessed request handler (may be ok on exit)" << LL_ENDL; + } } void LLMeshDecompositionHandler::processFailure(LLCore::HttpStatus status) @@ -3209,7 +3215,10 @@ void LLMeshDecompositionHandler::processData(LLCore::BufferArray * /* body */, S LLMeshPhysicsShapeHandler::~LLMeshPhysicsShapeHandler() { - llassert(mProcessed); + if (!mProcessed) + { + LL_WARNS(LOG_MESH) << "deleting unprocessed request handler (may be ok on exit)" << LL_ENDL; + } } void LLMeshPhysicsShapeHandler::processFailure(LLCore::HttpStatus status) |