diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2024-03-26 16:55:32 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2024-03-26 16:55:32 -0400 |
commit | c810a409e22b90ebacb9946f8a4084ef0ad78d64 (patch) | |
tree | 9fc508213bd00db70fc7aba7f3d4995541266f11 /indra/newview/lltooldraganddrop.h | |
parent | 656d1826e665b477e85ec3cf6db07677a3b88852 (diff) | |
parent | dd74c2cbd542daa8d6cedba7ba7a68268f7b73d3 (diff) |
Merge GLTF PBR Maint 2 to main.
Diffstat (limited to 'indra/newview/lltooldraganddrop.h')
-rw-r--r-- | indra/newview/lltooldraganddrop.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/lltooldraganddrop.h b/indra/newview/lltooldraganddrop.h index f69774952c..60a2f01107 100644 --- a/indra/newview/lltooldraganddrop.h +++ b/indra/newview/lltooldraganddrop.h @@ -249,17 +249,20 @@ public: ESource source, const LLUUID& src_id, bool all_faces, + bool replace_pbr, S32 tex_channel = -1); static void dropTextureOneFace(LLViewerObject* hit_obj, S32 hit_face, LLInventoryItem* item, ESource source, const LLUUID& src_id, + bool remove_pbr, S32 tex_channel = -1); static void dropTextureAllFaces(LLViewerObject* hit_obj, LLInventoryItem* item, ESource source, - const LLUUID& src_id); + const LLUUID& src_id, + bool remove_pbr); static void dropMaterial(LLViewerObject* hit_obj, S32 hit_face, LLInventoryItem* item, |