Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[LLMeshRepo sync] relwithdebinfo compile fixes

Browse Source
This commit is contained in:
Lirusaito
2014-04-19 00:25:11 -04:00
parent cb8cd702e1
commit 0523965822
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llmeshrepository.cpp
View File

@@ -746,7 +746,7 @@ void LLMeshRepoThread::loadMeshLOD(const LLVolumeParams& mesh_params, S32 lod)
if (pending != mPendingLOD.end()) if (pending != mPendingLOD.end())
{ //append this lod request to existing header request { //append this lod request to existing header request
pending->second.push_back(lod); pending->second.push_back(lod);
llassert(pending->second.size() <= LLModel::NUM_LODS) llassert(pending->second.size() <= LLModel::NUM_LODS);
} }
else else
{ //if no header request is pending, fetch header { //if no header request is pending, fetch header
@@ -1920,7 +1920,7 @@ void LLMeshLODResponder::completedRaw(U32 status, const std::string& reason,
} }
else else
{ {
llassert(status == HTTP_INTERNAL_ERROR || status == HTTP_SERVICE_UNAVAILABLE); //intentionally trigger a breakpoint llassert(is_internal_http_error_that_warrants_a_retry(status) || status == HTTP_SERVICE_UNAVAILABLE); //intentionally trigger a breakpoint
llwarns << "Unhandled status " << status << llendl; llwarns << "Unhandled status " << status << llendl;
} }
return; return;
@@ -1984,7 +1984,7 @@ void LLMeshSkinInfoResponder::completedRaw(U32 status, const std::string& reason
} }
else else
{ {
llassert(status == HTTP_INTERNAL_ERROR || status == HTTP_SERVICE_UNAVAILABLE); //intentionally trigger a breakpoint llassert(is_internal_http_error_that_warrants_a_retry(status) || status == HTTP_SERVICE_UNAVAILABLE); //intentionally trigger a breakpoint
llwarns << "Unhandled status " << status << llendl; llwarns << "Unhandled status " << status << llendl;
} }
return; return;
@@ -2047,7 +2047,7 @@ void LLMeshDecompositionResponder::completedRaw(U32 status, const std::string& r
} }
else else
{ {
llassert(status == HTTP_INTERNAL_ERROR || status == HTTP_SERVICE_UNAVAILABLE); //intentionally trigger a breakpoint llassert(is_internal_http_error_that_warrants_a_retry(status) || status == HTTP_SERVICE_UNAVAILABLE); //intentionally trigger a breakpoint
llwarns << "Unhandled status " << status << llendl; llwarns << "Unhandled status " << status << llendl;
} }
return; return;
@@ -2111,7 +2111,7 @@ void LLMeshPhysicsShapeResponder::completedRaw(U32 status, const std::string& re
} }
else else
{ {
llassert(status == HTTP_INTERNAL_ERROR || status == HTTP_SERVICE_UNAVAILABLE); //intentionally trigger a breakpoint llassert(is_internal_http_error_that_warrants_a_retry(status) || status == HTTP_SERVICE_UNAVAILABLE); //intentionally trigger a breakpoint
llwarns << "Unhandled status " << status << llendl; llwarns << "Unhandled status " << status << llendl;
} }
return; return;
@@ -2171,7 +2171,7 @@ void LLMeshHeaderResponder::completedRaw(U32 status, const std::string& reason,
// and (somewhat more optional than the others) retries // and (somewhat more optional than the others) retries
// again after some set period of time // again after some set period of time
llassert(status == HTTP_NOT_FOUND || status == HTTP_SERVICE_UNAVAILABLE || status == HTTP_REQUEST_TIME_OUT || status == HTTP_INTERNAL_ERROR); llassert(status == HTTP_NOT_FOUND || status == HTTP_SERVICE_UNAVAILABLE || status == HTTP_REQUEST_TIME_OUT || is_internal_http_error_that_warrants_a_retry(status));
if (is_internal_http_error_that_warrants_a_retry(status) || status == HTTP_SERVICE_UNAVAILABLE) if (is_internal_http_error_that_warrants_a_retry(status) || status == HTTP_SERVICE_UNAVAILABLE)
{ //retry { //retry