diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-06-14 18:20:55 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2018-06-14 18:20:55 -0400 |
| commit | 4dba69b04ab9825f1cd4b8dbf855494a3897ffd7 (patch) | |
| tree | 2f3a5324daf25ccea323ce5caa8dc238b6e37bbe /indra/newview/llmeshrepository.cpp | |
| parent | 9b7640d70ae820a954634ecf0dae43dfb33c0d3a (diff) | |
| parent | 67f6625c56406604197507c842496f031eb0986f (diff) | |
Automated merge with file:///Users/nat/linden/viewer-no-vstool
Diffstat (limited to 'indra/newview/llmeshrepository.cpp')
| -rw-r--r-- | indra/newview/llmeshrepository.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index 71a161198a..5b6720c3c7 100644 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -4027,7 +4027,7 @@ void LLMeshRepository::uploadModel(std::vector<LLModelInstance>& data, LLVector3 S32 LLMeshRepository::getMeshSize(const LLUUID& mesh_id, S32 lod) { - if (mThread && mesh_id.notNull()) + if (mThread && mesh_id.notNull() && LLPrimitive::NO_LOD != lod) { LLMutexLock lock(mThread->mHeaderMutex); LLMeshRepoThread::mesh_header_map::iterator iter = mThread->mMeshHeader.find(mesh_id); |