Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into DRTVWR-559

1 files changed, 6 insertions, 1 deletions

diff --git a/indra/newview/llmaterialeditor.h b/indra/newview/llmaterialeditor.h
index a632d5c823..dd0a17976c 100644
--- a/indra/newview/llmaterialeditor.h
+++ b/indra/newview/llmaterialeditor.h
@@ -81,12 +81,15 @@ public:
 
     bool decodeAsset(const std::vector<char>& buffer);
 
-    bool saveIfNeeded(LLInventoryItem* copyitem = nullptr, bool sync = true);
+    bool saveIfNeeded();
+    static bool saveToInventoryItem(const std::string &buffer, const LLUUID &item_id, const LLUUID &task_id);
 
     static void finishInventoryUpload(LLUUID itemId, LLUUID newAssetId, LLUUID newItemId);
 
     static void finishTaskUpload(LLUUID itemId, LLUUID newAssetId, LLUUID taskId);
 
+    static void finishSaveAs(const LLUUID &oldItemId, const LLUUID &newItemId, const std::string &buffer);
+
     void refreshFromInventory(const LLUUID& new_item_id = LLUUID::null);
 
     void onClickSaveAs();
@@ -143,6 +146,8 @@ public:
     void setDoubleSided(bool double_sided);
 
     void setHasUnsavedChanges(bool value);
+    void setCanSaveAs(BOOL value);
+    void setCanSave(BOOL value);
 
     void onCommitAlbedoTexture(LLUICtrl* ctrl, const LLSD& data);
     void onCommitMetallicTexture(LLUICtrl* ctrl, const LLSD& data);