3 files changed, 5 insertions, 11 deletions
diff --git a/indra/llappearanceutility/llbakingavatar.h b/indra/llappearanceutility/llbakingavatar.h
index 8261dfc814..b4cf99cbfb 100644
--- a/indra/llappearanceutility/llbakingavatar.h
+++ b/indra/llappearanceutility/llbakingavatar.h
@@ -38,15 +38,7 @@ class LLBakingAvatar : public LLAvatarAppearance
  **                    INITIALIZATION
  **/
 public:
-    void* operator new(size_t size)
-    {
-        return ll_aligned_malloc_16(size);
-    }
-
-    void operator delete(void* ptr)
-    {
-        ll_aligned_free_16(ptr);
-    }
+    LL_ALIGN_NEW
 
     LLBakingAvatar(LLWearableData* wearable_data, S32 bakeTextureSize = 512);
     virtual ~LLBakingAvatar();
diff --git a/indra/llappearanceutility/llbakingjoint.h b/indra/llappearanceutility/llbakingjoint.h
index 07e15a1d04..10201cc7b8 100644
--- a/indra/llappearanceutility/llbakingjoint.h
+++ b/indra/llappearanceutility/llbakingjoint.h
@@ -29,8 +29,9 @@
 
 #include "llavatarjoint.h"
 
-class LLBakingJoint : public virtual LLAvatarJoint
+class alignas(16) LLBakingJoint : public virtual LLAvatarJoint
 {
+    LL_ALIGN_NEW
 public:
     LLBakingJoint();
     LLBakingJoint(S32 joint_num);
diff --git a/indra/llappearanceutility/llbakingjointmesh.h b/indra/llappearanceutility/llbakingjointmesh.h
index a66bf3f61b..9c7b276bd8 100644
--- a/indra/llappearanceutility/llbakingjointmesh.h
+++ b/indra/llappearanceutility/llbakingjointmesh.h
@@ -30,8 +30,9 @@
 #include "llavatarjointmesh.h"
 #include "llbakingjoint.h"
 
-class LLBakingJointMesh : public LLAvatarJointMesh, public LLBakingJoint
+class alignas(16) LLBakingJointMesh : public LLAvatarJointMesh, public LLBakingJoint
 {
+    LL_ALIGN_NEW
 public:
     LLBakingJointMesh();
     LLBakingJointMesh(S32 joint_num);