summaryrefslogtreecommitdiff
path: root/indra/llcharacter
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2012-08-31 14:12:12 -0500
committerDave Parks <davep@lindenlab.com>2012-08-31 14:12:12 -0500
commitc1c80133a29b97112c887a75252fafe7a70d9a78 (patch)
treea12482c97cd86cdd23eab675b319e4f993781ee8 /indra/llcharacter
parentff92759181615babd91c41b1a980561dd631f4d9 (diff)
parentde1d297deaedaeff212eb2ff13ec4edef21ce633 (diff)
merge
Diffstat (limited to 'indra/llcharacter')
-rw-r--r--indra/llcharacter/llvisualparam.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcharacter/llvisualparam.h b/indra/llcharacter/llvisualparam.h
index 694e27f371..281fb14781 100644
--- a/indra/llcharacter/llvisualparam.h
+++ b/indra/llcharacter/llvisualparam.h
@@ -89,6 +89,7 @@ protected:
// An interface class for a generalized parametric modification of the avatar mesh
// Contains data that is specific to each Avatar
//-----------------------------------------------------------------------------
+LL_ALIGN_PREFIX(16)
class LLVisualParam
{
public:
@@ -160,6 +161,6 @@ protected:
S32 mID; // id for storing weight/morphtarget compares compactly
LLVisualParamInfo *mInfo;
-};
+} LL_ALIGN_POSTFIX(16);
#endif // LL_LLVisualParam_H