diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2024-02-09 11:48:31 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-09 11:48:31 -0600 |
| commit | d7642b11fb2632e3839676413a10104db3ca6401 (patch) | |
| tree | 9adb6550e3d81de000f31791ea3e302cc23a4d7a /indra/newview/lltooldraganddrop.h | |
| parent | d6048bfcb2442ca7ec278864b9827d74873efa3a (diff) | |
| parent | 846337483c0d3cce0607efe2ff17ed04dc90801f (diff) | |
Merge pull request #778 from secondlife/release/gltf-maint2
Release/gltf maint2
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 7bdd2d1a49..db2fe87f20 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, |