From 940c0239a69eebe77b7a437b493eca783fe5f1b4 Mon Sep 17 00:00:00 2001
From: phr0z3nt04st <phr0z3nt04st@gmail.com>
Date: Wed, 23 Jun 2010 18:19:27 -0500
Subject: [PATCH] Forgot to stop texture uploading if import is cancelled.

---
 indra/newview/llimportobject.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llimportobject.cpp b/indra/newview/llimportobject.cpp
index 16b9057c1..f0d285f8d 100644
--- 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)
 		{