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.cpp | |
| 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.cpp')
| -rwxr-xr-x | indra/newview/llviewerobject.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index c4d3829ee9..2153754d3f 100755 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -4098,6 +4098,7 @@ LLViewerObject* LLViewerObject::getRootEdit() const BOOL LLViewerObject::lineSegmentIntersect(const LLVector4a& start, const LLVector4a& end, S32 face, BOOL pick_transparent, + BOOL pick_rigged, S32* face_hit, LLVector4a* intersection, LLVector2* tex_coord, |