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

1 files changed, 4 insertions, 0 deletions

diff --git a/indra/newview/llmaterialeditor.h b/indra/newview/llmaterialeditor.h
index 6ccb27cf27..b2a6e96eac 100644
--- a/indra/newview/llmaterialeditor.h
+++ b/indra/newview/llmaterialeditor.h
@@ -99,6 +99,7 @@ public:
 
     LLUUID getAlbedoId();
     void setAlbedoId(const LLUUID& id);
+    void setAlbedoUploadId(const LLUUID& id);
 
     LLColor4 getAlbedoColor();
 
@@ -118,6 +119,7 @@ public:
 
     LLUUID getMetallicRoughnessId();
     void setMetallicRoughnessId(const LLUUID& id);
+    void setMetallicRoughnessUploadId(const LLUUID& id);
 
     F32 getMetalnessFactor();
     void setMetalnessFactor(F32 factor);
@@ -127,12 +129,14 @@ public:
 
     LLUUID getEmissiveId();
     void setEmissiveId(const LLUUID& id);
+    void setEmissiveUploadId(const LLUUID& id);
 
     LLColor4 getEmissiveColor();
     void setEmissiveColor(const LLColor4& color);
 
     LLUUID getNormalId();
     void setNormalId(const LLUUID& id);
+    void setNormalUploadId(const LLUUID& id);
 
     bool getDoubleSided();
     void setDoubleSided(bool double_sided);