diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-08-04 00:15:15 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-08-04 00:15:15 +0300 |
| commit | 014d7616b65fba699690589426a74e8acfc1a16c (patch) | |
| tree | d17ffdfb93d4194cfe51cd5c2a603850f9d45de2 /indra/newview/lltooldraganddrop.h | |
| parent | 1f53aab286a89dc246a8bdc5a4db3ee524d4412c (diff) | |
| parent | 9dba9f80f4d40ec12a735ddbb66a9d103a959ece (diff) | |
Merge branch master (DRTVWR-561) into DRTVWR-483
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 24a712029c..4537d73332 100644 --- a/indra/newview/lltooldraganddrop.h +++ b/indra/newview/lltooldraganddrop.h @@ -244,7 +244,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, |