diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-09-27 23:32:18 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-09-27 23:32:18 -0500 |
| commit | d9b610dd928997c18459fd039885628ac8905f88 (patch) | |
| tree | 859c4661df7d9fe9ed4f095b5ad0cc4cbaa3fff7 /indra/newview/lltooldraganddrop.h | |
| parent | aaf7b17db047f0cb2630b479d5468062e6ca815e (diff) | |
| parent | e6fad1ea5fb353f8ffd6423f2dcebe35002e8d2b (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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltooldraganddrop.h b/indra/newview/lltooldraganddrop.h index cfdbd931ce..bf35840964 100644 --- a/indra/newview/lltooldraganddrop.h +++ b/indra/newview/lltooldraganddrop.h @@ -94,7 +94,7 @@ public: // deal with permissions of object, etc. returns TRUE if drop can // proceed, otherwise FALSE. - static BOOL handleDropTextureProtections(LLViewerObject* hit_obj, + static BOOL handleDropMaterialProtections(LLViewerObject* hit_obj, LLInventoryItem* item, LLToolDragAndDrop::ESource source, const LLUUID& src_id); |