diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-08-25 09:14:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-25 09:14:09 -0400 |
| commit | 9f50a5b25bc7471fba5cdb19d6793f460422cbe5 (patch) | |
| tree | b9ab1b401ebd556ed97580ab9f94cd8fb83d121a /indra/newview/llmeshrepository.h | |
| parent | cefee59b0e5fff683a50fe61633a9c14493d7145 (diff) | |
| parent | 2a3fa6964507f133a599649efe58e350efc43fdf (diff) | |
Merge pull request #4603 from secondlife/release/2025.06
Update develop with latest 2025.06 changes.
Diffstat (limited to 'indra/newview/llmeshrepository.h')
| -rw-r--r-- | indra/newview/llmeshrepository.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h index 2b772f7803..ab17b921d6 100644 --- a/indra/newview/llmeshrepository.h +++ b/indra/newview/llmeshrepository.h @@ -691,6 +691,8 @@ public: }; typedef std::map<LLPointer<LLModel>, instance_list, LLUploadModelInstanceLess> instance_map; instance_map mInstance; + typedef std::map<std::string, std::string> lod_sources_map_t; + lod_sources_map_t mLodSources; LLMutex* mMutex; S32 mPendingUploads; @@ -707,7 +709,8 @@ public: std::string mWholeModelUploadURL; LLUUID mDestinationFolderId; - LLMeshUploadThread(instance_list& data, LLVector3& scale, bool upload_textures, + LLMeshUploadThread(instance_list& data, const lod_sources_map_t& sources_list, + LLVector3& scale, bool upload_textures, bool upload_skin, bool upload_joints, bool lock_scale_if_joint_position, const std::string & upload_url, const LLUUID destination_folder_id = LLUUID::null, @@ -869,7 +872,8 @@ public: bool meshUploadEnabled(); bool meshRezEnabled(); - void uploadModel(std::vector<LLModelInstance>& data, LLVector3& scale, bool upload_textures, + void uploadModel(std::vector<LLModelInstance>& data, const std::map<std::string, std::string> &lod_sources, + LLVector3& scale, bool upload_textures, bool upload_skin, bool upload_joints, bool lock_scale_if_joint_position, std::string upload_url, const LLUUID& destination_folder_id = LLUUID::null, |