SL-9748 - more cases

2 files changed, 4 insertions, 3 deletions

diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 71ae31e665..4a51533a57 100644
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -483,6 +483,7 @@ void LLFloaterModelPreview::prepareToLoadModel(S32 lod)
 	{
 		// loading physics from file
 		mModelPreview->mPhysicsSearchLOD = lod;
+		mModelPreview->mLastSpecifiedPhysicsP = NULL;
 	}
 }
 void LLFloaterModelPreview::loadModel(S32 lod)
diff --git a/indra/newview/llmodelpreview.cpp b/indra/newview/llmodelpreview.cpp
index 54a0c1a5bb..4e3b4c5c41 100644
--- a/indra/newview/llmodelpreview.cpp
+++ b/indra/newview/llmodelpreview.cpp
@@ -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];