diff options
author | Oz Linden <oz@lindenlab.com> | 2013-03-08 10:10:59 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-03-08 10:10:59 -0500 |
commit | a7f02a3e51f07c657a0acd31637f46f74b30daf7 (patch) | |
tree | c572c162ee7bec027971ca7a64f74032938b20a8 /indra/llcommon/stdenums.h | |
parent | cce59647a99648af63c96168c36e85563da40a1a (diff) | |
parent | 55b2383f51ffabf7e95595df5d576f383d458ee1 (diff) |
merge changes for 3.5.0-beta2
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 40b3364b36..efcbe76795 100644 --- a/indra/llcommon/stdenums.h +++ b/indra/llcommon/stdenums.h @@ -51,7 +51,8 @@ enum EDragAndDropType DAD_LINK = 14, DAD_MESH = 15, DAD_WIDGET = 16, - DAD_COUNT = 17, // number of types in this enum + DAD_PERSON = 17, + DAD_COUNT = 18, // number of types in this enum }; // Reasons for drags to be denied. |