summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterbulkpermission.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2022-06-28 15:15:57 -0500
committerDave Parks <davep@lindenlab.com>2022-06-28 15:15:57 -0500
commit57805cac68bbc67ecb8a8e76c0ced2ce9b622dd1 (patch)
treecdc7d029f5375d6c33d6ffc73db6400cebe1baa5 /indra/newview/llfloaterbulkpermission.cpp
parentcc535ecccc3c415655a52cc597b33102e5ea21db (diff)
SL-17379 More complete integration of material asset type
Diffstat (limited to 'indra/newview/llfloaterbulkpermission.cpp')
-rw-r--r--indra/newview/llfloaterbulkpermission.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llfloaterbulkpermission.cpp b/indra/newview/llfloaterbulkpermission.cpp
index a1a06706bc..a3cc939f85 100644
--- a/indra/newview/llfloaterbulkpermission.cpp
+++ b/indra/newview/llfloaterbulkpermission.cpp
@@ -306,6 +306,7 @@ void LLFloaterBulkPermission::handleInventory(LLViewerObject* viewer_obj, LLInve
( asstype == LLAssetType::AT_LSL_TEXT && gSavedSettings.getBOOL("BulkChangeIncludeScripts" )) ||
( asstype == LLAssetType::AT_SOUND && gSavedSettings.getBOOL("BulkChangeIncludeSounds" )) ||
( asstype == LLAssetType::AT_SETTINGS && gSavedSettings.getBOOL("BulkChangeIncludeSettings" )) ||
+ ( asstype == LLAssetType::AT_MATERIAL && gSavedSettings.getBOOL("BulkChangeIncludeMaterials")) ||
( asstype == LLAssetType::AT_TEXTURE && gSavedSettings.getBOOL("BulkChangeIncludeTextures" )))
{
LLViewerObject* object = gObjectList.findObject(viewer_obj->getID());