From 8cfea0bab14afc29887de4b61350e6268b793622 Mon Sep 17 00:00:00 2001
From: Coaldust Numbers <none@none>
Date: Fri, 7 Jan 2011 15:08:42 -0500
Subject: VWR-1095 fix for problems with uploads following bulk upload failure
 de minimus contribution accepted without CA - Oz Linden

---
 doc/contributions.txt                     | 2 ++
 indra/newview/llassetuploadresponders.cpp | 1 +
 2 files changed, 3 insertions(+)

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 3b14ce5125..9266ae3c5b 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -219,6 +219,8 @@ Catherine Pfeffer
 Celierra Darling
 	VWR-1274
 	VWR-6975
+Coaldust Numbers
+    VWR-1095
 Cron Stardust
 	VWR-10579
 Cypren Christenson
diff --git a/indra/newview/llassetuploadresponders.cpp b/indra/newview/llassetuploadresponders.cpp
index f12bc16d4b..dd5bc74b2a 100644
--- a/indra/newview/llassetuploadresponders.cpp
+++ b/indra/newview/llassetuploadresponders.cpp
@@ -126,6 +126,7 @@ void LLAssetUploadResponder::error(U32 statusNum, const std::string& reason)
 			break;
 	}
 	LLUploadDialog::modalUploadFinished();
+	LLFilePicker::instance().reset();  // unlock file picker when bulk upload fails
 }
 
 //virtual 
-- 
cgit v1.2.3