diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-06-04 14:39:08 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-06-04 14:39:08 -0400 |
| commit | 2f87c07a0f4986b641c94de5e7e29251ba1a2d97 (patch) | |
| tree | e58154d9e31ee4493b6284ac4b5bd1e7b177c56d /indra/newview/llviewerobject.cpp | |
| parent | 9acabccdde5cff91cac3bae0502c8ff5b26cada6 (diff) | |
| parent | a3a933e2120e4edf3c7f3c85a8ca04d76570f8ec (diff) | |
merge changes for build number fix
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rwxr-xr-x | indra/newview/llviewerobject.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 4e233d479a..198b13ee06 100755 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -3821,19 +3821,19 @@ LLViewerObject* LLViewerObject::getRootEdit() const } -BOOL LLViewerObject::lineSegmentIntersect(const LLVector3& start, const LLVector3& end, +BOOL LLViewerObject::lineSegmentIntersect(const LLVector4a& start, const LLVector4a& end, S32 face, BOOL pick_transparent, S32* face_hit, - LLVector3* intersection, + LLVector4a* intersection, LLVector2* tex_coord, - LLVector3* normal, - LLVector3* bi_normal) + LLVector4a* normal, + LLVector4a* tangent) { return false; } -BOOL LLViewerObject::lineSegmentBoundingBox(const LLVector3& start, const LLVector3& end) +BOOL LLViewerObject::lineSegmentBoundingBox(const LLVector4a& start, const LLVector4a& end) { if (mDrawable.isNull() || mDrawable->isDead()) { @@ -3850,11 +3850,7 @@ BOOL LLViewerObject::lineSegmentBoundingBox(const LLVector3& start, const LLVect size.setSub(ext[1], ext[0]); size.mul(0.5f); - LLVector4a starta, enda; - starta.load3(start.mV); - enda.load3(end.mV); - - return LLLineSegmentBoxIntersect(starta, enda, center, size); + return LLLineSegmentBoxIntersect(start, end, center, size); } U8 LLViewerObject::getMediaType() const |