diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-06-20 16:56:10 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-06-20 16:56:10 -0500 |
| commit | 1e3060f6d5658946395a618201fc6b9788c8f0be (patch) | |
| tree | 076ec2236c95dabcc7bbb06bc1077df49c1d2556 /indra/newview/pipeline.cpp | |
| parent | 9ea2d90a0dd9ca9ab76583187354533011ef3fcb (diff) | |
Merge cleanup
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rwxr-xr-x | indra/newview/pipeline.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 7bab06c868..9afb74bb52 100755 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -5210,7 +5210,7 @@ void LLPipeline::renderDebug() gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); - LLVector3 center = gDebugRaycastParticleIntersection; + LLVector3 center(gDebugRaycastParticleIntersection.getF32ptr()); LLVector3 size(0.1f, 0.1f, 0.1f); LLVector3 p[6]; @@ -6916,12 +6916,12 @@ void LLPipeline::setRenderHighlightTextureChannel(LLRender::eTexIndex channel) sRenderHighlightTextureChannel = channel; } -LLVOPartGroup* LLPipeline::lineSegmentIntersectParticle(const LLVector3& start, const LLVector3& end, LLVector3* intersection, +LLVOPartGroup* LLPipeline::lineSegmentIntersectParticle(const LLVector4a& start, const LLVector4a& end, LLVector4a* intersection, S32* face_hit) { - LLVector3 local_end = end; + LLVector4a local_end = end; - LLVector3 position; + LLVector4a position; LLDrawable* drawable = NULL; @@ -6958,7 +6958,7 @@ LLVOPartGroup* LLPipeline::lineSegmentIntersectParticle(const LLVector3& start, return ret; } -LLViewerObject* LLPipeline::lineSegmentIntersectInWorld(const LLVector3& start, const LLVector3& end, +LLViewerObject* LLPipeline::lineSegmentIntersectInWorld(const LLVector4a& start, const LLVector4a& end, BOOL pick_transparent, S32* face_hit, LLVector4a* intersection, // return the intersection point |