Automated merge with ssh://hg.lindenlab.com/davep/viewer-mesh/

1 files changed, 9 insertions, 2 deletions

diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 1336043b7f..d89d3e5c0a 100644
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -2211,9 +2211,16 @@ void LLModelPreview::loadModel(std::string filename, S32 lod)
 		mModelLoader = NULL;
 	}
 
-	if (filename.empty() && mBaseModel.empty())
+	if (filename.empty())
 	{
-		mFMP->closeFloater(false);
+		if (mBaseModel.empty())
+		{
+			// this is the initial file picking. Close the whole floater
+			// if we don't have a base model to show for high LOD.
+			mFMP->closeFloater(false);
+		}
+
+		mFMP->mLoading = false;
 		return;
 	}