diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2013-01-25 17:58:11 -0500 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2013-01-25 17:58:11 -0500 |
| commit | 438ceeb008b7c4eec0fc48894935289ca352fc65 (patch) | |
| tree | c14813597483c0caeafed02e8820458fa9562a03 /indra/llappearance/llpolyskeletaldistortion.h | |
| parent | 11fe124ae96721b0d0f960732e8628fe0e2f84c4 (diff) | |
BUILDFIX: merge cleanup
A couple of merge issues that caused the resulting code to not build.
Diffstat (limited to 'indra/llappearance/llpolyskeletaldistortion.h')
| -rw-r--r-- | indra/llappearance/llpolyskeletaldistortion.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llappearance/llpolyskeletaldistortion.h b/indra/llappearance/llpolyskeletaldistortion.h index 170f8e8771..774bc7dfa2 100644 --- a/indra/llappearance/llpolyskeletaldistortion.h +++ b/indra/llappearance/llpolyskeletaldistortion.h @@ -119,7 +119,7 @@ public: /*virtual*/ const LLVector4a* getNextDistortion(U32 *index, LLPolyMesh **poly_mesh){index = 0; poly_mesh = NULL; return NULL;}; protected: - LL_ALIGN_16(LLVector4a>-mDefaultVec); + LL_ALIGN_16(LLVector4a mDefaultVec); typedef std::map<LLJoint*, LLVector3> joint_vec_map_t; joint_vec_map_t mJointScales; joint_vec_map_t mJointOffsets; |