diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-08-04 13:05:39 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-08-04 13:05:39 -0700 |
| commit | 057d115ac3de49db0e35066975441e64111c8369 (patch) | |
| tree | a9ed61cd2abcf4a09416548e4b3240b9264fe9a2 | |
| parent | 76206db45e7966657ce757d74a9ebad991b61ff1 (diff) | |
LLStoreAssetCallback now a std::function
| -rw-r--r-- | indra/newview/lloutfitgallery.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/lloutfitgallery.cpp b/indra/newview/lloutfitgallery.cpp index a90a29a731..0c129d1164 100644 --- a/indra/newview/lloutfitgallery.cpp +++ b/indra/newview/lloutfitgallery.cpp @@ -1220,7 +1220,6 @@ void LLOutfitGallery::uploadOutfitImage(const std::vector<std::string>& filename checkRemovePhoto(outfit_id); std::string upload_pending_name = outfit_id.asString(); std::string upload_pending_desc = ""; - LLAssetStorage::LLStoreAssetCallback callback = NULL; LLUUID photo_id = upload_new_resource(filename, // file upload_pending_name, upload_pending_desc, @@ -1228,7 +1227,7 @@ void LLOutfitGallery::uploadOutfitImage(const std::vector<std::string>& filename LLFloaterPerms::getNextOwnerPerms("Uploads"), LLFloaterPerms::getGroupPerms("Uploads"), LLFloaterPerms::getEveryonePerms("Uploads"), - upload_pending_name, callback, expected_upload_cost, nruserdata); + upload_pending_name, LLAssetStorage::LLStoreAssetCallback(), expected_upload_cost, nruserdata); mOutfitLinkPending = outfit_id; } delete unit; |