diff options
| author | leyla_linden <none@none> | 2011-01-10 12:10:36 -0800 |
|---|---|---|
| committer | leyla_linden <none@none> | 2011-01-10 12:10:36 -0800 |
| commit | b63a404613182edfd230abda595f064c7bcc1c10 (patch) | |
| tree | 18a4cb6abdfa52bb68ded012f9f4b53d491b0c48 /indra/newview/llassetuploadresponders.cpp | |
| parent | 523722652259d37841be2ad4ad283df4887ad372 (diff) | |
| parent | fdf19a526821291bd3d6a6e1f6b78dcaeac63705 (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 |