diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-03-26 15:43:42 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-03-26 15:43:42 -0500 |
| commit | 224217dae82ad5f5127c511de6c7237fa81f36bb (patch) | |
| tree | dcac313b4655fceac4f710e764fa6cf437475040 /indra/newview/llviewermenufile.cpp | |
| parent | b187aeb8f177bd76e792652e773617beff18b47b (diff) | |
| parent | 302f4085a5f9fd7b5267fd573a8e15f890cfe573 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewermenufile.cpp')
| -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, |