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

SL-9748 - Apply explicitly given physics shape only if the usual rules do not.

master
Howard Stearns 2022-02-25 18:32:55 -08:00
parent 1abc02ed6b
commit 9210ec8a82
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/llmodelpreview.cpp
View File

@ -529,6 +529,16 @@ void LLModelPreview::rebuildUploadData()
LLFloaterModelPreview::addStringToLog(out, false);
}
}
if (!mLastSpecifiedPhysicsModelOriginalName.empty() && !lod_model && (i == LLModel::LOD_PHYSICS))
{
// Despite the various strategies above, if we don't now have a physics model, we're going to end up with decomposition.
// That's ok, but in the case where someone supplied a physics file, that's probably not what they wanted.
std::ostringstream out;
out << "Reusing previously matched physics model " << mLastSpecifiedPhysicsModelOriginalName;
LL_INFOS() << out.str() << LL_ENDL;
LLFloaterModelPreview::addStringToLog(out, false);
lod_model = mLastSpecifiedPhysicsP;
}
if (lod_model)
{
@ -1185,7 +1195,11 @@ void LLModelPreview::loadModelCallback(S32 loaded_lod)
LL_WARNS() << out.str() << LL_ENDL;
LLFloaterModelPreview::addStringToLog(out, false);
}
if (loaded_lod == LLModel::LOD_PHYSICS)
{
mLastSpecifiedPhysicsModelOriginalName = loaded_name;
mLastSpecifiedPhysicsP = mModel[loaded_lod][idx];
}
mModel[loaded_lod][idx]->mLabel = name;
}
}

2
indra/newview/llmodelpreview.h
View File

@ -217,6 +217,8 @@ private:
LLVOAvatar* getPreviewAvatar(void) { return mPreviewAvatar; }
// Count amount of original models, excluding sub-models
static U32 countRootModels(LLModelLoader::model_list models);
LLModel* mLastSpecifiedPhysicsP{}; // As opposed to being found by name or LOD;
std::string mLastSpecifiedPhysicsModelOriginalName{""}; // Since the above will have it's label bashed.
protected:
friend class LLModelLoader;