diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-01 07:22:32 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-01 07:22:32 -0500 |
| commit | f0074f1002f36ad680ae04daf3f5e026dca31d54 (patch) | |
| tree | e55cad847d3dbd156b8386272d0778bdf952c33a /indra/newview/llassetuploadresponders.cpp | |
| parent | 1aa01ad67fbe15ed43d8bb0bc7fb34a076a484b0 (diff) | |
| parent | ed308d15bf2f88f91687411cd92f6cc55b1e75b4 (diff) | |
merge changes back from beta branch
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 |