diff options
| author | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2015-09-22 20:32:57 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2015-09-22 20:32:57 +0300 |
| commit | 3a8ac4305746540a003c43e0c9e8cf75d8b68d4f (patch) | |
| tree | 95b235d37d6499735a7458e868e2b8c9e0ec870c /indra/newview/llviewerobject.h | |
| parent | 3cec33653bace09c52aeca0bd9a74efc7d11c985 (diff) | |
| parent | f2bea6c44bf0b37d39a3bff6bbe0f5a636d28b21 (diff) | |
Merged in maint-5416 (pull request #2)
MAINT-5416 FIXED Cannot right-click a rigged mesh that's worn
Diffstat (limited to 'indra/newview/llviewerobject.h')
| -rwxr-xr-x | indra/newview/llviewerobject.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index 65d6f8225f..95654ae1ff 100755 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -268,6 +268,7 @@ public: virtual BOOL lineSegmentIntersect(const LLVector4a& start, const LLVector4a& end, S32 face = -1, // which face to check, -1 = ALL_SIDES BOOL pick_transparent = FALSE, + BOOL pick_rigged = FALSE, S32* face_hit = NULL, // which face was hit LLVector4a* intersection = NULL, // return the intersection point LLVector2* tex_coord = NULL, // return the texture coordinates of the intersection point |