diff options
author | Palmer <palmer@lindenlab.com> | 2009-11-17 13:40:11 -0800 |
---|---|---|
committer | Palmer <palmer@lindenlab.com> | 2009-11-17 13:40:11 -0800 |
commit | 53495d74ee380d492cfed0af91f7660f49619a9f (patch) | |
tree | 5992e4769c9acbecc900710048a8eeb4a7806ae4 /indra/llcommon/stdenums.h | |
parent | 2365dbcd459b37942ddacbcb7010232113a126c1 (diff) | |
parent | c02702f3871979cb7745b49aa502ac3c71f77681 (diff) |
Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/llcommon/stdenums.h')
-rw-r--r-- | indra/llcommon/stdenums.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcommon/stdenums.h b/indra/llcommon/stdenums.h index 1a5678dde1..6eead924da 100644 --- a/indra/llcommon/stdenums.h +++ b/indra/llcommon/stdenums.h @@ -55,7 +55,8 @@ enum EDragAndDropType DAD_ANIMATION = 12, DAD_GESTURE = 13, DAD_LINK = 14, - DAD_COUNT = 15, // number of types in this enum + DAD_MESH = 15, + DAD_COUNT = 16, // number of types in this enum }; // Reasons for drags to be denied. |