diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2021-10-15 14:02:17 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2021-10-15 14:02:17 +0100 |
| commit | e0ea20a3c95197c042da9684b5e9e2f7d4f126fd (patch) | |
| tree | a6b6c74e89b31f59aca624fe3e61d48ce2fdfb99 /indra/llprimitive | |
| parent | 7868ba0c60ff762f56180121fd117e350767934e (diff) | |
| parent | 02f813d17bcf4592f6425e207e9fe487275b9354 (diff) | |
Merge branch 'DRTVWR-546' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-546
Diffstat (limited to 'indra/llprimitive')
| -rw-r--r-- | indra/llprimitive/llmodel.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/llprimitive/llmodel.h b/indra/llprimitive/llmodel.h index 96d4582b4f..cd2b6c6728 100644 --- a/indra/llprimitive/llmodel.h +++ b/indra/llprimitive/llmodel.h @@ -40,8 +40,10 @@ class domMesh; #define MAX_MODEL_FACES 8 +LL_ALIGN_PREFIX(16) class LLMeshSkinInfo { + LL_ALIGN_NEW public: LLMeshSkinInfo(); LLMeshSkinInfo(LLSD& data); @@ -55,15 +57,17 @@ public: matrix_list_t mInvBindMatrix; matrix_list_t mAlternateBindMatrix; - LLMatrix4a mBindShapeMatrix; + LL_ALIGN_16(LLMatrix4a mBindShapeMatrix); float mPelvisOffset; bool mLockScaleIfJointPosition; bool mInvalidJointsScrubbed; bool mJointNumsInitialized; -}; +} LL_ALIGN_POSTFIX(16); +LL_ALIGN_PREFIX(16) class LLModel : public LLVolume { + LL_ALIGN_NEW public: enum @@ -285,7 +289,7 @@ public: EModelStatus mStatus ; int mSubmodelID; -}; +} LL_ALIGN_POSTFIX(16); typedef std::vector<LLPointer<LLModel> > model_list; typedef std::queue<LLPointer<LLModel> > model_queue; |