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/llviewerwindow.cpp | |
| parent | 9ea2d90a0dd9ca9ab76583187354533011ef3fcb (diff) | |
Merge cleanup
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rwxr-xr-x | indra/newview/llviewerwindow.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 19426090a2..87ae224655 100755 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -231,7 +231,7 @@ BOOL gShowOverlayTitle = FALSE; LLViewerObject* gDebugRaycastObject = NULL; LLVOPartGroup* gDebugRaycastParticle = NULL; LLVector4a gDebugRaycastIntersection; -LLVector3 gDebugRaycastParticleIntersection; +LLVector4a gDebugRaycastParticleIntersection; LLVector2 gDebugRaycastTexCoord; LLVector4a gDebugRaycastNormal; LLVector4a gDebugRaycastTangent; @@ -5180,9 +5180,9 @@ void LLPickInfo::fetchResults() LLVector4a origin; origin.load3(LLViewerCamera::getInstance()->getOrigin().mV); F32 icon_dist = 0.f; - LLVector3 start; - LLVector3 end; - LLVector3 particle_end; + LLVector4a start; + LLVector4a end; + LLVector4a particle_end; if (hit_icon) { |