diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-01-10 11:20:39 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-01-10 11:20:39 -0500 |
| commit | fdf19a526821291bd3d6a6e1f6b78dcaeac63705 (patch) | |
| tree | 840aacb00347dade197ad74862fdec9be513749d /indra/newview/llassetuploadresponders.cpp | |
| parent | c4989c17ed3848f676364e1927ccad13fb628e2c (diff) | |
| parent | 964e981458234aed37252a7b484f6f6765fff50d (diff) | |
Automated merge up from viewer-development
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 |