diff options
author | Oz Linden <oz@lindenlab.com> | 2011-01-28 17:05:11 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-01-28 17:05:11 -0500 |
commit | b4b3f78c455a614d7738c29cdc6383e857d6028d (patch) | |
tree | 84e35e9c1b2a05743b6236e9a7bfd14316169d13 /indra/newview/llassetuploadresponders.cpp | |
parent | a9d023a4618e4e425d5d51e750374deebeff3bc0 (diff) | |
parent | ee2678be57668844221a462ed1e215c3c7cbd841 (diff) |
pull back fixes from beta
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 |