diff options
| author | AndreyL ProductEngine <andreylproductengine@lindenlab.com> | 2015-07-23 23:59:05 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <andreylproductengine@lindenlab.com> | 2015-07-23 23:59:05 +0300 |
| commit | 57904b4def8c75a865ba503976de98d9ee4c0d94 (patch) | |
| tree | 923e35ad6197d9487f56f87dc6417c5972858bc5 /indra/newview/llviewerwindow.h | |
| parent | 269cc894a95904578fe34cd89c563dc650349df8 (diff) | |
MAINT-5416 Reverted changeset: 9bd24c17d908
Diffstat (limited to 'indra/newview/llviewerwindow.h')
| -rwxr-xr-x | indra/newview/llviewerwindow.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/newview/llviewerwindow.h b/indra/newview/llviewerwindow.h index 52f51d4c97..7fde52d4e1 100755 --- a/indra/newview/llviewerwindow.h +++ b/indra/newview/llviewerwindow.h @@ -89,7 +89,6 @@ public: LLPickInfo(const LLCoordGL& mouse_pos, MASK keyboard_mask, BOOL pick_transparent, - BOOL pick_rigged, BOOL pick_particle, BOOL pick_surface_info, BOOL pick_unselectable, @@ -124,7 +123,6 @@ public: LLVector4 mTangent; LLVector3 mBinormal; BOOL mPickTransparent; - BOOL mPickRigged; BOOL mPickParticle; BOOL mPickUnselectable; void getSurfaceInfo(); @@ -369,9 +367,8 @@ public: MASK mask, void (*callback)(const LLPickInfo& pick_info), BOOL pick_transparent = FALSE, - BOOL pick_rigged = FALSE, BOOL pick_unselectable = FALSE); - LLPickInfo pickImmediate(S32 x, S32 y, BOOL pick_transparent, BOOL pick_rigged = FALSE, BOOL pick_particle = FALSE); + LLPickInfo pickImmediate(S32 x, S32 y, BOOL pick_transparent, BOOL pick_particle = FALSE); LLHUDIcon* cursorIntersectIcon(S32 mouse_x, S32 mouse_y, F32 depth, LLVector4a* intersection); @@ -379,7 +376,6 @@ public: LLViewerObject *this_object = NULL, S32 this_face = -1, BOOL pick_transparent = FALSE, - BOOL pick_rigged = FALSE, S32* face_hit = NULL, LLVector4a *intersection = NULL, LLVector2 *uv = NULL, |