livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#4294 Make upload order more deterministic #2

master
Andrey Kleshchev 2025-07-14 18:47:03 +03:00 committed by Andrey Kleshchev
parent d033bbacf0
commit 5a50be4e15
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
indra/newview/llmeshrepository.cpp
View File

@ -2699,18 +2699,11 @@ void LLMeshUploadThread::wholeModelToLLSD(LLSD& dest, bool include_textures)
S32 instance_num = 0;
// Upload should happen in deterministic order, so sort instances by model name.
// Note: probably can sort by mBaseModel->mSubmodelID here as well to avoid
// running over the list twice.
std::vector<std::pair<LLModel*, instance_list>> sorted_instances(mInstance.begin(), mInstance.end());
std::sort(sorted_instances.begin(), sorted_instances.end(),
[](const std::pair<LLModel*, instance_list>& a, const std::pair<LLModel*, instance_list>& b)
{
return a.first->mLabel < b.first->mLabel;
});
// Handle models, ignore submodels for now
for (auto& iter : sorted_instances)
// Handle models, ignore submodels for now.
// Probably should pre-sort by mSubmodelID instead of running twice.
// Note: mInstance should be sorted by model name for the sake of
// deterministic order.
for (auto& iter : mInstance)
{
LLMeshUploadData data;
data.mBaseModel = iter.first;
@ -2869,7 +2862,7 @@ void LLMeshUploadThread::wholeModelToLLSD(LLSD& dest, bool include_textures)
}
// Now handle the submodels.
for (auto& iter : sorted_instances)
for (auto& iter : mInstance)
{
LLMeshUploadData data;
data.mBaseModel = iter.first;

17
indra/newview/llmeshrepository.h
View File

@ -674,7 +674,22 @@ public:
typedef std::vector<LLModelInstance> instance_list;
instance_list mInstanceList;
typedef std::map<LLPointer<LLModel>, instance_list> instance_map;
// Upload should happen in deterministic order, so sort instances by model name.
struct LLUploadModelInstanceLess
{
inline bool operator()(const LLPointer<LLModel>& a, const LLPointer<LLModel>& b) const
{
if (a.isNull() || b.isNull())
{
llassert(false); // We are uploading these models, they shouldn't be null.
return true;
}
// Note: probably can sort by mBaseModel->mSubmodelID here as well to avoid
// running over the list twice in wholeModelToLLSD.
return a->mLabel < b->mLabel;
}
};
typedef std::map<LLPointer<LLModel>, instance_list, LLUploadModelInstanceLess> instance_map;
instance_map mInstance;
LLMutex* mMutex;