From 6b46793771a1d1db1601105604ac7bc82f8db7b3 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 28 Sep 2022 20:01:06 +0300
Subject: SL-18233 Double clicking material in an object shows notecard

---
 indra/newview/llpanelobjectinventory.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'indra/newview/llpanelobjectinventory.cpp')

diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index 2faa3a7137..c5bf18a065 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -50,6 +50,7 @@
 #include "llinventoryicon.h"
 #include "llinventoryfilter.h"
 #include "llinventoryfunctions.h"
+#include "llmaterialeditor.h"
 #include "llpreviewanim.h"
 #include "llpreviewgesture.h"
 #include "llpreviewnotecard.h"
@@ -1197,17 +1198,17 @@ void LLTaskMaterialBridge::openItem()
         LLSD floater_key;
         floater_key["taskid"] = mPanel->getTaskUUID();
         floater_key["itemid"] = mUUID;
-        LLPreviewNotecard* preview = LLFloaterReg::showTypedInstance<LLPreviewNotecard>("preview_notecard", floater_key, TAKE_FOCUS_YES);
-        if (preview)
+        LLMaterialEditor* mat = LLFloaterReg::showTypedInstance<LLMaterialEditor>("material_editor", floater_key, TAKE_FOCUS_YES);
+        if (mat)
         {
-            preview->setObjectID(mPanel->getTaskUUID());
+            mat->setObjectID(mPanel->getTaskUUID());
         }
     }
 }
 
 BOOL LLTaskMaterialBridge::removeItem()
 {
-    LLFloaterReg::hideInstance("preview_notecard", LLSD(mUUID));
+    LLFloaterReg::hideInstance("material_editor", LLSD(mUUID));
     return LLTaskInvFVBridge::removeItem();
 }
 
-- 
cgit v1.2.3