diff options
| author | Dave Parks <davep@lindenlab.com> | 2021-10-14 18:03:41 +0000 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2021-10-14 18:03:41 +0000 |
| commit | 08c767d231a9ed96fc8755a3426f992cb23a63b5 (patch) | |
| tree | f1098b331df2ec42db671b5491f54d7bcbd74059 /indra/llprimitive | |
| parent | e7227afe0249806ceb1c8eef2dd6ca909eb394d3 (diff) | |
| parent | 851767b808c3cb05d718538389ccc1ed3c95d1a1 (diff) | |
Merged DRTVWR-546 into SL-16166
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; |