summaryrefslogtreecommitdiff
path: root/indra/newview/llpolymorph.h
diff options
context:
space:
mode:
authorBaker Linden <baker@lindenlab.com>2013-01-09 15:25:06 -0800
committerBaker Linden <baker@lindenlab.com>2013-01-09 15:25:06 -0800
commitc4a1bd1c2f2e8da202c59d756e5d49b273e5145c (patch)
tree96f3ccbb2c5d534f021052fafab97bedd6d57e91 /indra/newview/llpolymorph.h
parentb0c449d301299a4ba1b7d83e930f9df6b071b931 (diff)
parentcdd45b9abb35b40f2a31e7433fb99e588df8b40b (diff)
viewer-development merge
Diffstat (limited to 'indra/newview/llpolymorph.h')
-rw-r--r--indra/newview/llpolymorph.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llpolymorph.h b/indra/newview/llpolymorph.h
index 678599d7e1..24940c52e0 100644
--- a/indra/newview/llpolymorph.h
+++ b/indra/newview/llpolymorph.h
@@ -41,6 +41,7 @@ class LLWearable;
//-----------------------------------------------------------------------------
// LLPolyMorphData()
//-----------------------------------------------------------------------------
+LL_ALIGN_PREFIX(16)
class LLPolyMorphData
{
public:
@@ -75,12 +76,13 @@ public:
F32 mTotalDistortion; // vertex distortion summed over entire morph
F32 mMaxDistortion; // maximum single vertex distortion in a given morph
- LLVector4a mAvgDistortion; // average vertex distortion, to infer directionality of the morph
+ LL_ALIGN_16(LLVector4a mAvgDistortion); // average vertex distortion, to infer directionality of the morph
LLPolyMeshSharedData* mMesh;
private:
void freeData();
-};
+} LL_ALIGN_POSTFIX(16);
+
//-----------------------------------------------------------------------------
// LLPolyVertexMask()