diff options
author | Graham Linden <graham@lindenlab.com> | 2018-08-06 18:39:52 +0100 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2018-08-06 18:39:52 +0100 |
commit | 46c6ead5c3fe87405a644e3167f15b9c6239ee03 (patch) | |
tree | 4117fbb6dc9aa7bc198e4796fe2c194b4938df3f /indra/newview/lltooldraganddrop.h | |
parent | 7da3a1eb4f14b67c698977eb1947ce06a312d507 (diff) | |
parent | 057d115ac3de49db0e35066975441e64111c8369 (diff) |
Merge
Diffstat (limited to 'indra/newview/lltooldraganddrop.h')
-rw-r--r-- | indra/newview/lltooldraganddrop.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/lltooldraganddrop.h b/indra/newview/lltooldraganddrop.h index 2d99de2244..24a712029c 100644 --- a/indra/newview/lltooldraganddrop.h +++ b/indra/newview/lltooldraganddrop.h @@ -162,6 +162,8 @@ protected: MASK mask, BOOL drop); EAcceptance dad3dRezObjectOnObject(LLViewerObject* obj, S32 face, MASK mask, BOOL drop); + EAcceptance dad3dRezCategoryOnObject(LLViewerObject* obj, S32 face, + MASK mask, BOOL drop); EAcceptance dad3dRezScript(LLViewerObject* obj, S32 face, MASK mask, BOOL drop); EAcceptance dad3dTextureObject(LLViewerObject* obj, S32 face, |