diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-08-02 23:02:42 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-08-02 23:02:42 +0100 |
| commit | bd7ad9c157776244912e652e93162cbbd32088f1 (patch) | |
| tree | ce7da254212a1d5e0a7a9fdd81b71059046d134f /indra/newview/lltooldraganddrop.h | |
| parent | 34d595716bb9224cc4f173bd968db86bc88cbaed (diff) | |
| parent | 09f97172bb478a2c977d8b7b0958196e7e98c433 (diff) | |
Merge viewer-release
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, |