diff options
author | Dave Parks <davep@lindenlab.com> | 2010-06-14 23:04:11 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2010-06-14 23:04:11 -0500 |
commit | 37a8c12bd34b2bd119b50f32d6e081ab59d1f5c4 (patch) | |
tree | ccdc7a5952a55dab7417251b248a25f6ca6fd530 /indra/newview/llviewerwindow.h | |
parent | b3fc9c79f559c84893dede3ce643ac0dfd1f3d65 (diff) | |
parent | ad5a45624a702433d481c3dbc0f348a8755b367c (diff) |
merge
Diffstat (limited to 'indra/newview/llviewerwindow.h')
-rw-r--r-- | indra/newview/llviewerwindow.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.h b/indra/newview/llviewerwindow.h index 410445d97f..156a1ff8ad 100644 --- a/indra/newview/llviewerwindow.h +++ b/indra/newview/llviewerwindow.h @@ -361,7 +361,9 @@ public: LLVector3 *intersection = NULL, LLVector2 *uv = NULL, LLVector3 *normal = NULL, - LLVector3 *binormal = NULL); + LLVector3 *binormal = NULL, + LLVector3* start = NULL, + LLVector3* end = NULL); // Returns a pointer to the last object hit @@ -507,6 +509,8 @@ extern LLVector2 gDebugRaycastTexCoord; extern LLVector3 gDebugRaycastNormal; extern LLVector3 gDebugRaycastBinormal; extern S32 gDebugRaycastFaceHit; +extern LLVector3 gDebugRaycastStart; +extern LLVector3 gDebugRaycastEnd; extern S32 CHAT_BAR_HEIGHT; |