SL-17699 Blank material Id for material picker

5 files changed, 8 insertions, 7 deletions

diff --git a/indra/newview/llgltfmateriallist.cpp b/indra/newview/llgltfmateriallist.cpp
index 48f4305ee7..ab7a6495c4 100644
--- a/indra/newview/llgltfmateriallist.cpp
+++ b/indra/newview/llgltfmateriallist.cpp
@@ -47,6 +47,8 @@
 
 LLGLTFMaterialList gGLTFMaterialList;
 
+const LLUUID LLGLTFMaterialList::BLANK_MATERIAL_ASSET_ID("968cbad0-4dad-d64e-71b5-72bf13ad051a");
+
 namespace
 {
     class LLGLTFMaterialOverrideDispatchHandler : public LLDispatchHandler
diff --git a/indra/newview/llgltfmateriallist.h b/indra/newview/llgltfmateriallist.h
index f770f6ecc8..b74e0b3ec2 100644
--- a/indra/newview/llgltfmateriallist.h
+++ b/indra/newview/llgltfmateriallist.h
@@ -37,6 +37,8 @@ class LLFetchedGLTFMaterial;
 class LLGLTFMaterialList
 {
 public:
+    static const LLUUID BLANK_MATERIAL_ASSET_ID;
+
     LLGLTFMaterialList() {}
 
 
diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp
index 1213deec64..533f882d39 100644
--- a/indra/newview/llmaterialeditor.cpp
+++ b/indra/newview/llmaterialeditor.cpp
@@ -2333,11 +2333,6 @@ bool LLMaterialEditor::setFromSelection()
 
 void LLMaterialEditor::loadAsset()
 {
-    // derived from LLPreviewNotecard::loadAsset
-    
-    // TODO: see commented out "editor" references and make them do something appropriate to the UI
-   
-    // request the asset.
     const LLInventoryItem* item;
     if (mNotecardInventoryID.notNull())
     {
@@ -2405,6 +2400,7 @@ void LLMaterialEditor::loadAsset()
 
                 setEnableEditing(false); // wait for it to load
 
+                // request the asset.
                 gAssetStorage->getInvItemAsset(source_sim,
                     gAgent.getID(),
                     gAgent.getSessionID(),
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index c6e0bc5153..6d8d19c57c 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -223,7 +223,7 @@ BOOL	LLPanelFace::postBuild()
     if (pbr_ctrl)
     {
         pbr_ctrl->setDefaultImageAssetID(LLUUID::null);
-        pbr_ctrl->setBlankImageAssetID(LLUUID::null); // should there be some empty default material?
+        pbr_ctrl->setBlankImageAssetID(LLGLTFMaterialList::BLANK_MATERIAL_ASSET_ID);
         pbr_ctrl->setCommitCallback(boost::bind(&LLPanelFace::onCommitPbr, this, _2));
         pbr_ctrl->setOnCancelCallback(boost::bind(&LLPanelFace::onCancelPbr, this, _2));
         pbr_ctrl->setOnSelectCallback(boost::bind(&LLPanelFace::onSelectPbr, this, _2));
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index ebb7ee609c..07e09ec038 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -700,8 +700,9 @@ void LLFloaterTexturePicker::onBtnBlank(void* userdata)
 void LLFloaterTexturePicker::onBtnNone(void* userdata)
 {
 	LLFloaterTexturePicker* self = (LLFloaterTexturePicker*) userdata;
+    self->setCanApply(true, true);
 	self->setImageID( LLUUID::null );
-	self->commitCancel();
+    self->commitIfImmediateSet();
 }
 
 /*