diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-07-26 17:45:22 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-07-26 17:45:22 +0300 |
| commit | f710ab3d3f054160b5c79ba042af12a8c9652677 (patch) | |
| tree | 4339d66a3378c38ad0bd5e49a9d72d88567ce0a9 /indra/newview | |
| parent | 9c6eb9ae4088b355d01ada204879b973aa160b7c (diff) | |
| parent | 1b1f4252e3a243fcdc0906ada0c124dfe7b864bf (diff) | |
Merged in lindenlab/viewer-lynx
Diffstat (limited to 'indra/newview')
| -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 3d8490bbd7..27b26efa51 100644 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -3934,7 +3934,7 @@ const LLSD* LLMeshRepoThread::getMeshHeader(const LLUUID& mesh_id) { LLMutexLock lock(mHeaderMutex); mesh_header_map::iterator iter = mMeshHeader.find(mesh_id); - if (iter != mMeshHeader.end()) + if (iter != mMeshHeader.end() && mMeshHeaderSize[mesh_id] > 0) { return &(iter->second); } |