diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-08-05 16:58:38 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-08-05 16:58:38 -0500 |
| commit | 8007b43876831a0d88833bdc8fd7eb6d543dd38b (patch) | |
| tree | c5c34cbb5c9a9c7bd915b331abb17ab914e3f53a /indra/newview/lltooldraganddrop.h | |
| parent | d048795fce3ab83989cb909fde02014f1442cc84 (diff) | |
| parent | aca495c8812d49a5fde80ecefbf3f609b4042bf9 (diff) | |
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/lltooldraganddrop.h')
| -rw-r--r-- | indra/newview/lltooldraganddrop.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lltooldraganddrop.h b/indra/newview/lltooldraganddrop.h index 2f6423080e..cfdbd931ce 100644 --- a/indra/newview/lltooldraganddrop.h +++ b/indra/newview/lltooldraganddrop.h @@ -246,7 +246,8 @@ public: static void dropTextureOneFace(LLViewerObject* hit_obj, S32 hit_face, LLInventoryItem* item, ESource source, - const LLUUID& src_id); + const LLUUID& src_id, + S32 tex_channel = -1); static void dropTextureAllFaces(LLViewerObject* hit_obj, LLInventoryItem* item, ESource source, |