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

SL-9748 - more cases

master
Howard Stearns 2022-03-02 17:39:12 -08:00
parent 130d0c0704
commit 239a29ab5c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/llfloatermodelpreview.cpp
View File

@ -483,6 +483,7 @@ void LLFloaterModelPreview::prepareToLoadModel(S32 lod)
{
// loading physics from file
mModelPreview->mPhysicsSearchLOD = lod;
mModelPreview->mLastSpecifiedPhysicsP = NULL;
}
}
void LLFloaterModelPreview::loadModel(S32 lod)

6
indra/newview/llmodelpreview.cpp
View File

@ -470,8 +470,8 @@ void LLModelPreview::rebuildUploadData()
// 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 physics model " << mLastSpecifiedPhysicsModelOriginalName << " for " << instance.mLabel;
LL_INFOS() << out.str() << LL_ENDL;
out << "No physics model specified for " << instance.mLabel << ". Reusing physics model " << mLastSpecifiedPhysicsModelOriginalName << ".";
LL_WARNS() << out.str() << LL_ENDL;
LLFloaterModelPreview::addStringToLog(out, false);
lod_model = mLastSpecifiedPhysicsP;
}
@ -1140,7 +1140,7 @@ void LLModelPreview::loadModelCallback(S32 loaded_lod)
}
}
}
else if ((loaded_lod == LLModel::LOD_PHYSICS) && (mModel[loaded_lod].size() == 1))
else if ((loaded_lod == LLModel::LOD_PHYSICS) && !mLastSpecifiedPhysicsP)
{
mLastSpecifiedPhysicsModelOriginalName = stripSuffix(mModel[loaded_lod][0]->mLabel);
mLastSpecifiedPhysicsP = mModel[loaded_lod][0];