diff options
author | Oz Linden <oz@lindenlab.com> | 2011-05-23 11:38:33 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-05-23 11:38:33 -0400 |
commit | 551d17f819ea3dbcdc61cb41a458ab6d893d28cf (patch) | |
tree | 130c90ed3b0f6a4245af843cf9170130d549dc4f /indra/llcommon/stdenums.h | |
parent | 99fe1004a6cb4406bcac790420a5be6269e02723 (diff) | |
parent | e5752934be74a84e6ec0ff8cb96974bd1e9060ec (diff) |
merge latest changes (post-2.7.0) from viewer-development
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 9f86de124e..556eff8370 100644 --- a/indra/llcommon/stdenums.h +++ b/indra/llcommon/stdenums.h @@ -49,7 +49,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. |