diff -r 78fae8ca1b36 -r 93874c3d90fd doc/contributions.txt
--- a/doc/contributions.txt	Fri Jan 07 12:46:55 2011 -0500
+++ b/doc/contributions.txt	Fri Jan 07 15:08:42 2011 -0500
@@ -219,6 +219,8 @@
 Celierra Darling
 	VWR-1274
 	VWR-6975
+Coaldust Numbers
+    VWR-1095
 Cron Stardust
 	VWR-10579
 Cypren Christenson
diff -r 78fae8ca1b36 -r 93874c3d90fd indra/newview/llassetuploadresponders.cpp
--- a/indra/newview/llassetuploadresponders.cpp	Fri Jan 07 12:46:55 2011 -0500
+++ b/indra/newview/llassetuploadresponders.cpp	Fri Jan 07 15:08:42 2011 -0500
@@ -126,6 +126,7 @@
 			break;
 	}
 	LLUploadDialog::modalUploadFinished();
+	LLFilePicker::instance().reset();  // unlock file picker when bulk upload fails
 }
 
 //virtual