diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-05-08 11:42:31 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-05-08 11:42:31 -0700 |
| commit | 605c9c19661702755171669e2af846abe77d2a51 (patch) | |
| tree | 8ab3bcd992c8167c1b9bdd9af074cd8acf39bcf7 /indra/newview/llviewermenufile.cpp | |
| parent | b5055e890743783746a3691f14b81a6bc62f2bff (diff) | |
Fix merge fail.
Diffstat (limited to 'indra/newview/llviewermenufile.cpp')
| -rw-r--r-- | indra/newview/llviewermenufile.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp index 693d2ab60a..07873f482f 100644 --- a/indra/newview/llviewermenufile.cpp +++ b/indra/newview/llviewermenufile.cpp @@ -812,7 +812,7 @@ void upload_done_callback( LLStringUtil::trim(asset_name); std::string display_name = LLStringUtil::null; - LLAssetStorage::LLStoreAssetCallback callback = NULL; + LLAssetStorage::LLStoreAssetCallback callback; void *userdata = NULL; upload_new_resource( next_file, |