diff options
| author | Ptolemy <ptolemy@lindenlab.com> | 2021-10-22 15:15:07 -0700 |
|---|---|---|
| committer | Ptolemy <ptolemy@lindenlab.com> | 2021-10-22 15:15:07 -0700 |
| commit | 2c2f6f2a9b867552460a9c2e52b9d9dab0b73b14 (patch) | |
| tree | e682c2a2f74325bc58a95b320e65a92a8959223e /indra/newview/llmeshrepository.cpp | |
| parent | 26e8d2d8c7328878cb6bc83eb6b3b7b5b1462f17 (diff) | |
| parent | 3efd4c50a031ce0c1cb3d2fcc43e403136277e1f (diff) | |
Merge branch 'DRTVWR-546' into SL-16127
Diffstat (limited to 'indra/newview/llmeshrepository.cpp')
| -rw-r--r-- | indra/newview/llmeshrepository.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index 8ac64dbd15..a19d6d0b19 100644 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -4045,7 +4045,7 @@ S32 LLMeshRepository::getActualMeshLOD(const LLVolumeParams& mesh_params, S32 lo const LLMeshSkinInfo* LLMeshRepository::getSkinInfo(const LLUUID& mesh_id, const LLVOVolume* requesting_obj) { - LL_RECORD_BLOCK_TIME(FTM_MESH_FETCH); + LL_PROFILE_ZONE_SCOPED; if (mesh_id.notNull()) { skin_map::iterator iter = mSkinMap.find(mesh_id); @@ -4055,6 +4055,7 @@ const LLMeshSkinInfo* LLMeshRepository::getSkinInfo(const LLUUID& mesh_id, const } //no skin info known about given mesh, try to fetch it + if (requesting_obj != nullptr) { LLMutexLock lock(mMeshMutex); //add volume to list of loading meshes |