From 9be08fc56bd6079fd58d43ceb5d6a7bb5e45b42c Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Fri, 28 Jul 2023 10:31:31 -0500
Subject: [PATCH] SL-20037 Don't pop up the material editor implicitly.
---
indra/newview/llviewermessage.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index b756d3d87f4..539951b9398 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -1532,7 +1532,7 @@ void open_inventory_offer(const uuid_vec_t& objects, const std::string& from_nam
LLFloaterReg::showInstance("preview_sound", LLSD(obj_id), take_focus);
break;
case LLAssetType::AT_MATERIAL:
- LLFloaterReg::showInstance("material_editor", LLSD(obj_id), take_focus);
+ // Explicitly do nothing -- we don't want to open the material editor every time you add a material to inventory
break;
default:
LL_DEBUGS("Messaging") << "No preview method for previewable asset type : " << LLAssetType::lookupHumanReadable(asset_type) << LL_ENDL;
--
GitLab