diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-24 14:22:08 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-24 14:22:08 -0500 |
| commit | de83bd5c6b1e103993ba74321d600f1c413785ce (patch) | |
| tree | 7a93bec47e33227541abda9ea80b7b094c8be549 /indra/newview/llassetuploadresponders.cpp | |
| parent | f57aa3e83f1b4286b1d6b5cc8bca20fb924cb002 (diff) | |
| parent | 295536ae98cb88bfa551ac73ae2e19a8c2ddfc88 (diff) | |
merge changes for beta fixes
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 |