diff options
| author | Oz Linden <oz@lindenlab.com> | 2018-08-02 16:36:50 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2018-08-02 16:36:50 -0400 |
| commit | 5e8995220304a105d821eb3bccd8be484520174a (patch) | |
| tree | 9b4ba9044ba7f98a38865fc854914e6b9e248486 /indra/newview/lltooldraganddrop.h | |
| parent | c339894390af70b32cef3fca258b9a19ce4aeb20 (diff) | |
| parent | 09f97172bb478a2c977d8b7b0958196e7e98c433 (diff) | |
merge changes for 5.1.7-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, |