diff options
author | akleshchev <117672381+akleshchev@users.noreply.github.com> | 2022-12-07 02:16:12 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-07 02:16:12 +0200 |
commit | c69c8aa347363bc51ed256523bc368d4584dbfd1 (patch) | |
tree | 8e60dd7e471a00634452189f85d67b3901e52136 /indra/newview/llmaterialeditor.h | |
parent | c033278ec2d16181b94d6433a3353765c8981850 (diff) |
SL-18777 PBR upload was stuck waiting for texture
Handle obscure upload failure case - floater was waiting for a texture upload indefinetely.
Unblock floater if upload fails.
Diffstat (limited to 'indra/newview/llmaterialeditor.h')
-rw-r--r-- | indra/newview/llmaterialeditor.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llmaterialeditor.h b/indra/newview/llmaterialeditor.h index d23a741e49..74c776031e 100644 --- a/indra/newview/llmaterialeditor.h +++ b/indra/newview/llmaterialeditor.h @@ -116,14 +116,13 @@ public: static void savePickedMaterialAs(); static void onSaveObjectsMaterialAsMsgCallback(const LLSD& notification, const LLSD& response); - static void loadFromGLTFMaterial(LLUUID &asset_id); - static void onLoadComplete(const LLUUID& asset_uuid, LLAssetType::EType type, void* user_data, S32 status, LLExtStat ext_status); void inventoryChanged(LLViewerObject* object, LLInventoryObject::object_list_t* inventory, S32 serial_num, void* user_data) override; 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); + void setFailedToUploadTexture(); // save textures to inventory if needed // returns amount of scheduled uploads @@ -295,6 +294,7 @@ private: U32 mRevertedChanges; // flags to indicate individual reverted parameters S32 mUploadingTexturesCount; S32 mExpectedUploadCost; + bool mUploadingTexturesFailure; std::string mMaterialNameShort; std::string mMaterialName; |