diff options
| author | paul_productengine <none@none> | 2012-02-24 21:29:59 +0200 |
|---|---|---|
| committer | paul_productengine <none@none> | 2012-02-24 21:29:59 +0200 |
| commit | d356e2be0ffbc64b5df28b49d8bc3e043957fa21 (patch) | |
| tree | ffb0943ad87373afed70cb07f81f73ba2fd2974f | |
| parent | a128836dedf25dc56807cced9316fbaa09a7f019 (diff) | |
MAINT-387 FIXED [PUBLIC]Possible crash in llviewermenufile/upload_done_callback
- Just moved the deletion to the inspected block
| -rw-r--r-- | indra/newview/llviewermenufile.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp index 7e830e14bf..cacb8a8766 100644 --- a/indra/newview/llviewermenufile.cpp +++ b/indra/newview/llviewermenufile.cpp @@ -949,11 +949,12 @@ void upload_done_callback( args["REASON"] = std::string(LLAssetStorage::getErrorString(result)); LLNotificationsUtil::add("CannotUploadReason", args); } + + delete data; + data = NULL; } LLUploadDialog::modalUploadFinished(); - delete data; - data = NULL; // *NOTE: This is a pretty big hack. What this does is check the // file picker if there are any more pending uploads. If so, |