diff options
| author | Coaldust Numbers <none@none> | 2011-01-07 15:08:42 -0500 |
|---|---|---|
| committer | Coaldust Numbers <none@none> | 2011-01-07 15:08:42 -0500 |
| commit | 8cfea0bab14afc29887de4b61350e6268b793622 (patch) | |
| tree | 5be277b2eeab8c7a23dce7a9ba26b21f871ebb89 | |
| parent | c132d20a7433e2d09e3521a15497f661fcbd18b8 (diff) | |
VWR-1095 fix for problems with uploads following bulk upload failure
de minimus contribution accepted without CA - Oz Linden
| -rw-r--r-- | doc/contributions.txt | 2 | ||||
| -rw-r--r-- | indra/newview/llassetuploadresponders.cpp | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 3b14ce5125..9266ae3c5b 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -219,6 +219,8 @@ Catherine Pfeffer Celierra Darling VWR-1274 VWR-6975 +Coaldust Numbers + VWR-1095 Cron Stardust VWR-10579 Cypren Christenson 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 |