diff options
Diffstat (limited to 'linden/indra/newview/pipeline.h')
| -rw-r--r-- | linden/indra/newview/pipeline.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/newview/pipeline.h b/linden/indra/newview/pipeline.h index 5f94e37..c795283 100644 --- a/linden/indra/newview/pipeline.h +++ b/linden/indra/newview/pipeline.h | |||
| @@ -131,6 +131,7 @@ public: | |||
| 131 | 131 | ||
| 132 | //get the object between start and end that's closest to start. | 132 | //get the object between start and end that's closest to start. |
| 133 | LLViewerObject* lineSegmentIntersectInWorld(const LLVector3& start, const LLVector3& end, | 133 | LLViewerObject* lineSegmentIntersectInWorld(const LLVector3& start, const LLVector3& end, |
| 134 | BOOL pick_transparent, | ||
| 134 | S32* face_hit, // return the face hit | 135 | S32* face_hit, // return the face hit |
| 135 | LLVector3* intersection = NULL, // return the intersection point | 136 | LLVector3* intersection = NULL, // return the intersection point |
| 136 | LLVector2* tex_coord = NULL, // return the texture coordinates of the intersection point | 137 | LLVector2* tex_coord = NULL, // return the texture coordinates of the intersection point |
| @@ -138,6 +139,7 @@ public: | |||
| 138 | LLVector3* bi_normal = NULL // return the surface bi-normal at the intersection point | 139 | LLVector3* bi_normal = NULL // return the surface bi-normal at the intersection point |
| 139 | ); | 140 | ); |
| 140 | LLViewerObject* lineSegmentIntersectInHUD(const LLVector3& start, const LLVector3& end, | 141 | LLViewerObject* lineSegmentIntersectInHUD(const LLVector3& start, const LLVector3& end, |
| 142 | BOOL pick_transparent, | ||
| 141 | S32* face_hit, // return the face hit | 143 | S32* face_hit, // return the face hit |
| 142 | LLVector3* intersection = NULL, // return the intersection point | 144 | LLVector3* intersection = NULL, // return the intersection point |
| 143 | LLVector2* tex_coord = NULL, // return the texture coordinates of the intersection point | 145 | LLVector2* tex_coord = NULL, // return the texture coordinates of the intersection point |
| @@ -317,7 +319,6 @@ public: | |||
| 317 | // RENDER_DEBUG_FEATURE_HW_LIGHTING = 0x0010, | 319 | // RENDER_DEBUG_FEATURE_HW_LIGHTING = 0x0010, |
| 318 | RENDER_DEBUG_FEATURE_FLEXIBLE = 0x0010, | 320 | RENDER_DEBUG_FEATURE_FLEXIBLE = 0x0010, |
| 319 | RENDER_DEBUG_FEATURE_FOG = 0x0020, | 321 | RENDER_DEBUG_FEATURE_FOG = 0x0020, |
| 320 | RENDER_DEBUG_FEATURE_PALETTE = 0x0040, | ||
| 321 | RENDER_DEBUG_FEATURE_FR_INFO = 0x0080, | 322 | RENDER_DEBUG_FEATURE_FR_INFO = 0x0080, |
| 322 | RENDER_DEBUG_FEATURE_FOOT_SHADOWS = 0x0100, | 323 | RENDER_DEBUG_FEATURE_FOOT_SHADOWS = 0x0100, |
| 323 | }; | 324 | }; |