From 16641fc33ddc9f77e725ea1c966a570caca4faa9 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 7 Apr 2020 20:00:38 +0300 Subject: SL-2569 LLSD header of a mesh should be covered by mutex --- indra/newview/llmeshrepository.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'indra/newview/llmeshrepository.h') diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h index bba0c9f2cb..59ca4db51e 100644 --- a/indra/newview/llmeshrepository.h +++ b/indra/newview/llmeshrepository.h @@ -341,7 +341,7 @@ public: bool skinInfoReceived(const LLUUID& mesh_id, U8* data, S32 data_size); bool decompositionReceived(const LLUUID& mesh_id, U8* data, S32 data_size); bool physicsShapeReceived(const LLUUID& mesh_id, U8* data, S32 data_size); - LLSD& getMeshHeader(const LLUUID& mesh_id); + bool hasPhysicsShapeInHeader(const LLUUID& mesh_id); void notifyLoadedMeshes(); S32 getActualMeshLOD(const LLVolumeParams& mesh_params, S32 lod); @@ -593,9 +593,6 @@ public: bool meshUploadEnabled(); bool meshRezEnabled(); - - - LLSD& getMeshHeader(const LLUUID& mesh_id); void uploadModel(std::vector& data, LLVector3& scale, bool upload_textures, bool upload_skin, bool upload_joints, bool lock_scale_if_joint_position, -- cgit v1.2.3 From 427ed91cf9a7fb156df3fd4873881348a25db142 Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Fri, 25 Sep 2020 16:14:13 +0300 Subject: post-merge cleanup --- indra/newview/llmeshrepository.h | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview/llmeshrepository.h') diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h index 919d990ccb..81e49cb1d8 100644 --- a/indra/newview/llmeshrepository.h +++ b/indra/newview/llmeshrepository.h @@ -343,7 +343,6 @@ public: bool skinInfoReceived(const LLUUID& mesh_id, U8* data, S32 data_size); bool decompositionReceived(const LLUUID& mesh_id, U8* data, S32 data_size); EMeshProcessingResult physicsShapeReceived(const LLUUID& mesh_id, U8* data, S32 data_size); - LLSD& getMeshHeader(const LLUUID& mesh_id); bool hasPhysicsShapeInHeader(const LLUUID& mesh_id); void notifyLoadedMeshes(); -- cgit v1.2.3