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

1 files changed, 7 insertions, 0 deletions

diff --git a/indra/newview/llmaterialeditor.h b/indra/newview/llmaterialeditor.h
index d329222648..96bf8cc7a2 100644
--- a/indra/newview/llmaterialeditor.h
+++ b/indra/newview/llmaterialeditor.h
@@ -215,6 +215,10 @@ public:
 
     // initialize the UI from a default GLTF material
     void loadDefaults();
+
+    void modifyMaterialCoro(std::string cap_url, LLSD overrides);
+    void setOverrideTarget(U32 local_id, S32 face_id);
+
 private:
     void loadMaterial(const tinygltf::Model &model, const std::string &filename_lc, S32 index);
 
@@ -264,5 +268,8 @@ private:
     S32 mExpectedUploadCost;
     std::string mMaterialNameShort;
     std::string mMaterialName;
+
+    U32 mOverrideLocalId;
+    S32 mOverrideFace;
 };