summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2015-09-23 11:32:39 -0400
committerOz Linden <oz@lindenlab.com>2015-09-23 11:32:39 -0400
commit2cd13dcab6a6c2acaab3e330b8e82b414201b3e3 (patch)
tree89746004e91d4c55ded4f28fa59c580012a7ecee /indra/newview
parenta8f4baac40611607d03f83391b51b9bf93e6bab1 (diff)
MAINT-5663: prevent crash in mesh handlers for very short sessions
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llmeshrepository.cpp15
1 files changed, 12 insertions, 3 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index 9a0bd9d1bc..e04cace18d 100755
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -2939,7 +2939,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)
@@ -2983,7 +2986,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)
@@ -3026,7 +3032,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)