diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-10-20 18:56:43 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-10-20 18:56:43 -0500 |
| commit | 492f820c6b8a164cb201fed232e40e743e8e38c4 (patch) | |
| tree | 7d360ddc2ff2288d1ec8163b6215cf9c81031b51 /indra/newview/llviewerobject.h | |
| parent | 1c58b3b18ea732e0032e70ae6dc9c8ec2f2834b4 (diff) | |
| parent | 34c01b6b1ff758463dcdff19782e5af668699304 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerobject.h')
| -rw-r--r-- | indra/newview/llviewerobject.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index 53e951e483..a77725c1ca 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -1,4 +1,4 @@ -/** +/** * @file llviewerobject.h * @brief Description of LLViewerObject class, which is the base class for most objects in the viewer. * @@ -811,7 +811,7 @@ public: virtual F32 getPartSize(S32 idx); virtual void getGeometry(S32 idx, - LLStrider<LLVector3>& verticesp, + LLStrider<LLVector4a>& verticesp, LLStrider<LLVector3>& normalsp, LLStrider<LLVector2>& texcoordsp, LLStrider<LLColor4U>& colorsp, |