diff options
| author | prep <prep@lindenlab.com> | 2011-01-10 16:08:02 -0500 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2011-01-10 16:08:02 -0500 |
| commit | 3fcdd7f41581e2e724be703687e717ea6ddc91ba (patch) | |
| tree | f3b3d4226aadc515a737e7831d91c941baacddbe /indra/newview/llassetuploadresponders.cpp | |
| parent | 9c60d1da81ae711b702b83bb388083bc19702472 (diff) | |
| parent | b63a404613182edfd230abda595f064c7bcc1c10 (diff) | |
merge
Diffstat (limited to 'indra/newview/llassetuploadresponders.cpp')
| -rw-r--r-- | indra/newview/llassetuploadresponders.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llassetuploadresponders.cpp b/indra/newview/llassetuploadresponders.cpp index 375ab82f50..c08771c5e7 100644 --- a/indra/newview/llassetuploadresponders.cpp +++ b/indra/newview/llassetuploadresponders.cpp @@ -228,6 +228,7 @@ void LLAssetUploadResponder::error(U32 statusNum, const std::string& reason) break; } LLUploadDialog::modalUploadFinished(); + LLFilePicker::instance().reset(); // unlock file picker when bulk upload fails } //virtual |