summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorRunitaiLinden <davep@lindenlab.com>2023-07-28 10:31:31 -0500
committerRunitaiLinden <davep@lindenlab.com>2023-07-28 10:31:31 -0500
commit9be08fc56bd6079fd58d43ceb5d6a7bb5e45b42c (patch)
tree7be0df86e98af10bb32c9513d280bab5f85187af /indra/newview
parent8c4fcd76ba9b25f10242682b0169a1b20bc27b86 (diff)
SL-20037 Don't pop up the material editor implicitly.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llviewermessage.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index b756d3d87f..539951b939 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;