SL-17690 Uploaded material asset references wrong texture UUIDs

Upload textures first, then get ids and upload material on callback

1 files changed, 5 insertions, 2 deletions

diff --git a/indra/newview/llmaterialeditor.h b/indra/newview/llmaterialeditor.h
index be376c9d2b..3da59c7f93 100644
--- a/indra/newview/llmaterialeditor.h
+++ b/indra/newview/llmaterialeditor.h
@@ -63,10 +63,12 @@ public:
 
     void inventoryChanged(LLViewerObject* object, LLInventoryObject::object_list_t* inventory, S32 serial_num, void* user_data) override;
 
-    void saveTexture(LLImageJ2C* img, const std::string& name, const LLUUID& asset_id);
+    typedef std::function<void(LLUUID newAssetId, LLSD response)> upload_callback_f;
+    void saveTexture(LLImageJ2C* img, const std::string& name, const LLUUID& asset_id, upload_callback_f cb);
 
     // save textures to inventory if needed
-    void saveTextures();
+    // returns amount of scheduled uploads
+    S32 saveTextures();
 
     void onClickSave();
 
@@ -191,6 +193,7 @@ private:
     LLPointer<LLImageJ2C> mEmissiveJ2C;
 
     bool mHasUnsavedChanges;
+    S32 mUploadingTexturesCount;
     S32 mExpectedUploadCost;
     std::string mMaterialName;
 };