From 4fd10e42383aba2eb9e68ff837c8eacb9cee3e83 Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Mon, 4 Oct 2010 17:56:00 -0400 Subject: SH-79 FIX upload window shows status "loading" if file selection canceled Extended the current filename checking to handle the case where we have a user cancel a selection of an LOD file beyond the first. mLoading is made false in either case, but the dialog is closed if a file has not been chosen for the highest LOD. --- indra/newview/llfloatermodelpreview.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index f98a708dae..6e051c66a9 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; } -- cgit v1.2.3