diff options
author | Ptolemy <ptolemy@lindenlab.com> | 2022-06-30 12:50:49 -0700 |
---|---|---|
committer | Ptolemy <ptolemy@lindenlab.com> | 2022-06-30 12:50:49 -0700 |
commit | 82232de0d2aecfddca2988249e79a73b4d972aa5 (patch) | |
tree | f6dfb8a8c2d0ca9ee3a3e3dca37386130ffe1653 /indra/newview/llviewertexteditor.cpp | |
parent | 38b6f10717918643c1169a4007dc92cfe36fc4d5 (diff) | |
parent | 68dfa1f5501f58d1ca158aeabcc3fd07e8a2e70f (diff) |
Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llviewertexteditor.cpp')
-rw-r--r-- | indra/newview/llviewertexteditor.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp index e2de7ac825..7c860936a5 100644 --- a/indra/newview/llviewertexteditor.cpp +++ b/indra/newview/llviewertexteditor.cpp @@ -879,6 +879,7 @@ BOOL LLViewerTextEditor::handleDragAndDrop(S32 x, S32 y, MASK mask, case DAD_ANIMATION: case DAD_GESTURE: case DAD_MESH: + case DAD_MATERIAL: { supported = true; break; |