diff options
| author | Don Kjer <don@lindenlab.com> | 2011-01-12 19:00:36 -0800 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-01-12 19:00:36 -0800 |
| commit | 756a4e26da6cec82d48a71d05b1f43623b56313d (patch) | |
| tree | 4dfa615e17c7941114679643e1aa5a2875583f29 /indra/newview/llassetuploadresponders.cpp | |
| parent | d8b4363c1d3f60741422419b386b79df23a6da6a (diff) | |
| parent | 55322713fc071a3e171fd4cfbea989945dc8d084 (diff) | |
Merge with 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 f12bc16d4b..dd5bc74b2a 100644 --- a/indra/newview/llassetuploadresponders.cpp +++ b/indra/newview/llassetuploadresponders.cpp @@ -126,6 +126,7 @@ void LLAssetUploadResponder::error(U32 statusNum, const std::string& reason) break; } LLUploadDialog::modalUploadFinished(); + LLFilePicker::instance().reset(); // unlock file picker when bulk upload fails } //virtual |