diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2016-07-12 21:37:45 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2016-07-12 21:37:45 +0300 |
| commit | b06d5aeec8144f18e039758d3c70e9414f83ce21 (patch) | |
| tree | e88a24b4302e35d982f121669986e5b25a615bc1 /indra/newview/llmeshrepository.h | |
| parent | 85c0bec92c74e13c08dc316d2d1c3b0941dff536 (diff) | |
MAINT-6460 Crash calculating mesh complexity
Diffstat (limited to 'indra/newview/llmeshrepository.h')
| -rw-r--r-- | indra/newview/llmeshrepository.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h index d35c44397b..8a1166522f 100644 --- a/indra/newview/llmeshrepository.h +++ b/indra/newview/llmeshrepository.h @@ -305,7 +305,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); + const LLSD* getMeshHeader(const LLUUID& mesh_id); void notifyLoadedMeshes(); S32 getActualMeshLOD(const LLVolumeParams& mesh_params, S32 lod); @@ -506,7 +506,7 @@ public: bool meshRezEnabled(); - LLSD& getMeshHeader(const LLUUID& mesh_id); + const LLSD* getMeshHeader(const LLUUID& mesh_id); void uploadModel(std::vector<LLModelInstance>& data, LLVector3& scale, bool upload_textures, bool upload_skin, bool upload_joints, std::string upload_url, bool do_upload = true, |