diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-01-17 03:46:29 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-01-17 03:46:29 +0200 |
| commit | 99308bb8a828c991be06c8620f02d6618328be15 (patch) | |
| tree | 42d44f6a2eedaa73d60d733a61f0b6ba56d4361a /indra/newview/llmeshrepository.cpp | |
| parent | 7acbd8ed8d73c507675d45360df07d232c431a8b (diff) | |
| parent | df376c029936da11b3e1dda54f9c327de50440a8 (diff) | |
Merged in andreyl_productengine/viewer64-marchcat (DRTVWR-431 fixes)
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 df708013fc..9edffea1c1 100644 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -3945,7 +3945,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); |