Sanity checks, bugfixes, crashfixes, and misc tweaks snagged from snowglobe.

2011-03-01 20:13:05 -06:00
parent 8c0fb1261c
commit 30b1bd7abb
12 changed files with 142 additions and 74 deletions
--- a/indra/newview/llassetuploadresponders.cpp
+++ b/indra/newview/llassetuploadresponders.cpp
@@ -129,6 +129,7 @@ void LLAssetUploadResponder::error(U32 statusNum, const std::string& reason)
 			break;
 	}
 	LLUploadDialog::modalUploadFinished();
+	LLFilePicker::instance().reset();  // unlock file picker when bulk upload fails
 }

 //virtual