SL-18233 Double clicking material in an object shows notecard

1 files changed, 15 insertions, 4 deletions

diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp
index 4f51030fc0..1592235dba 100644
--- a/indra/newview/llmaterialeditor.cpp
+++ b/indra/newview/llmaterialeditor.cpp
@@ -180,6 +180,16 @@ LLMaterialEditor::LLMaterialEditor(const LLSD& key)
     }
 }
 
+void LLMaterialEditor::setObjectID(const LLUUID& object_id)
+{
+    LLPreview::setObjectID(object_id);
+    const LLInventoryItem* item = getItem();
+    if (item)
+    {
+        mAssetID = item->getAssetUUID();
+    }
+}
+
 BOOL LLMaterialEditor::postBuild()
 {
     mBaseColorTextureCtrl = getChild<LLTextureCtrl>("base_color_texture");
@@ -751,7 +761,8 @@ bool LLMaterialEditor::decodeAsset(const std::vector<char>& buffer)
 
                     if (loader.LoadASCIIFromString(&model_in, &error_msg, &warn_msg, data.c_str(), data.length(), ""))
                     {
-                        return setFromGltfModel(model_in, true);
+                        // assets are only supposed to have one item
+                        return setFromGltfModel(model_in, 0, true);
                     }
                     else
                     {
@@ -1878,8 +1889,8 @@ void LLMaterialEditor::onLoadComplete(const LLUUID& asset_uuid,
 
             editor->decodeAsset(buffer);
 
-            BOOL allow_modify = editor->canModify(editor->mObjectID, editor->getItem());
-            BOOL source_library = editor->mObjectID.isNull() && gInventory.isObjectDescendentOf(editor->mItemUUID, gInventory.getLibraryRootFolderID());
+            BOOL allow_modify = editor->canModify(editor->mObjectUUID, editor->getItem());
+            BOOL source_library = editor->mObjectUUID.isNull() && gInventory.isObjectDescendentOf(editor->mItemUUID, gInventory.getLibraryRootFolderID());
             editor->setEnableEditing(allow_modify && !source_library);
             editor->setHasUnsavedChanges(false);
             editor->mAssetStatus = PREVIEW_ASSET_LOADED;
@@ -2083,5 +2094,5 @@ void LLMaterialEditor::loadDefaults()
 {
     tinygltf::Model model_in;
     model_in.materials.resize(1);
-    setFromGltfModel(model_in, true);
+    setFromGltfModel(model_in, 0, true);
 }