diff options
| author | Mark Palange <palange@lindenlab.com> | 2008-11-07 17:51:03 +0000 |
|---|---|---|
| committer | Mark Palange <palange@lindenlab.com> | 2008-11-07 17:51:03 +0000 |
| commit | f89f19990cbb9f3f2e7473ac6c159098bdfabec7 (patch) | |
| tree | e7fa406e2db5e9adc2e24e00557d7b3d3f93203a /indra/newview/pipeline.h | |
| parent | b2bfb128e7d30e1cdb293a2ac192a0cbe63fe528 (diff) | |
QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release
Diffstat (limited to 'indra/newview/pipeline.h')
| -rw-r--r-- | indra/newview/pipeline.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h index 4ba6f39456..bacfed0aed 100644 --- a/indra/newview/pipeline.h +++ b/indra/newview/pipeline.h @@ -131,6 +131,7 @@ public: //get the object between start and end that's closest to start. LLViewerObject* lineSegmentIntersectInWorld(const LLVector3& start, const LLVector3& end, + BOOL pick_transparent, S32* face_hit, // return the face hit LLVector3* intersection = NULL, // return the intersection point LLVector2* tex_coord = NULL, // return the texture coordinates of the intersection point @@ -138,6 +139,7 @@ public: LLVector3* bi_normal = NULL // return the surface bi-normal at the intersection point ); LLViewerObject* lineSegmentIntersectInHUD(const LLVector3& start, const LLVector3& end, + BOOL pick_transparent, S32* face_hit, // return the face hit LLVector3* intersection = NULL, // return the intersection point LLVector2* tex_coord = NULL, // return the texture coordinates of the intersection point |