Forgot to stop texture uploading if import is cancelled.

2010-06-23 18:19:27 -05:00
parent 4a88db9c5a
commit 940c0239a6
1 changed files with 1 additions and 1 deletions
--- a/indra/newview/llimportobject.cpp
+++ b/indra/newview/llimportobject.cpp
@@ -228,8 +228,8 @@ public:
 			gInventory.notifyObservers();
 			LLXmlImport::sTextureReplace[mData->oldassetid] = content["new_asset"].asUUID();
 		}
-
 		LLXmlImport::sUploadedAssets++;
+		if(!LLXmlImport::sImportInProgress) return;
 		LLFloaterImportProgress::update();
 		if(LLXmlImport::sUploadedAssets < LLXmlImport::sTotalAssets)
 		{