From 36a8a204343387e66e6039da1a29ec7a0c72ba09 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Wed, 26 Nov 2014 22:53:32 -0600
Subject: [PATCH] Alignment fixes.

---
 indra/llappearance/llavatarjoint.h         | 10 ++++++++++
 indra/llappearance/llpolymorph.h           | 10 ++++++++++
 indra/llcharacter/lleditingmotion.h        | 10 ++++++++++
 indra/llcharacter/llkeyframestandmotion.h  | 10 ++++++++++
 indra/llcharacter/llpose.h                 | 10 ++++++++++
 indra/newview/llfloaterexploreanimations.h | 10 ++++++++++
 indra/newview/llviewerjoint.h              | 10 ++++++++++
 indra/newview/llviewerjointattachment.h    | 10 ++++++++++
 indra/newview/llviewerjointmesh.h          | 10 ++++++++++
 9 files changed, 90 insertions(+)

diff --git a/indra/llappearance/llavatarjoint.h b/indra/llappearance/llavatarjoint.h
index fec91503c..e4da9bb9a 100644
--- a/indra/llappearance/llavatarjoint.h
+++ b/indra/llappearance/llavatarjoint.h
@@ -127,6 +127,16 @@ public:
 	LLAvatarJointCollisionVolume();
 	virtual ~LLAvatarJointCollisionVolume() {};
 
+	void* operator new(size_t size)
+	{
+		return ll_aligned_malloc_16(size);
+	}
+
+	void operator delete(void* ptr)
+	{
+		ll_aligned_free_16(ptr);
+	}
+
 	/*virtual*/ BOOL inheritScale() { return TRUE; }
 	/*virtual*/ U32 render( F32 pixelArea, BOOL first_pass = TRUE, BOOL is_dummy = FALSE );
 
diff --git a/indra/llappearance/llpolymorph.h b/indra/llappearance/llpolymorph.h
index f1ecef881..b00fef4ac 100644
--- a/indra/llappearance/llpolymorph.h
+++ b/indra/llappearance/llpolymorph.h
@@ -163,6 +163,16 @@ public:
 	LLPolyMorphTarget(LLPolyMesh *poly_mesh);
 	~LLPolyMorphTarget();
 
+	void* operator new(size_t size)
+	{
+		return ll_aligned_malloc_16(size);
+	}
+
+	void operator delete(void* ptr)
+	{
+		ll_aligned_free_16(ptr);
+	}
+
 	// Special: These functions are overridden by child classes
 	LLPolyMorphTargetInfo*	getInfo() const { return (LLPolyMorphTargetInfo*)mInfo; }
 	//   This sets mInfo and calls initialization functions
diff --git a/indra/llcharacter/lleditingmotion.h b/indra/llcharacter/lleditingmotion.h
index bc95ff682..b06d2b774 100644
--- a/indra/llcharacter/lleditingmotion.h
+++ b/indra/llcharacter/lleditingmotion.h
@@ -58,6 +58,16 @@ public:
 	// Destructor
 	virtual ~LLEditingMotion();
 
+	void* operator new(size_t size)
+	{
+		return ll_aligned_malloc_16(size);
+	}
+
+	void operator delete(void* ptr)
+	{
+		ll_aligned_free_16(ptr);
+	}
+
 public:
 	//-------------------------------------------------------------------------
 	// functions to support MotionController and MotionRegistry
diff --git a/indra/llcharacter/llkeyframestandmotion.h b/indra/llcharacter/llkeyframestandmotion.h
index 346df97f0..c3a9ddd22 100644
--- a/indra/llcharacter/llkeyframestandmotion.h
+++ b/indra/llcharacter/llkeyframestandmotion.h
@@ -53,6 +53,16 @@ public:
 	// Destructor
 	virtual ~LLKeyframeStandMotion();
 
+	void* operator new(size_t size)
+	{
+		return ll_aligned_malloc_16(size);
+	}
+
+	void operator delete(void* ptr)
+	{
+		ll_aligned_free_16(ptr);
+	}
+
 public:
 	//-------------------------------------------------------------------------
 	// functions to support MotionController and MotionRegistry
diff --git a/indra/llcharacter/llpose.h b/indra/llcharacter/llpose.h
index 2b976b219..63c0fdde4 100644
--- a/indra/llcharacter/llpose.h
+++ b/indra/llcharacter/llpose.h
@@ -96,6 +96,16 @@ protected:
 public:
 	LLJointStateBlender();
 	~LLJointStateBlender();
+	void* operator new(size_t size)
+	{
+		return ll_aligned_malloc_16(size);
+	}
+
+	void operator delete(void* ptr)
+	{
+		ll_aligned_free_16(ptr);
+	}
+
 	void blendJointStates(BOOL apply_now = TRUE);
 	BOOL addJointState(const LLPointer<LLJointState>& joint_state, S32 priority, BOOL additive_blend);
 	void interpolate(F32 u);
diff --git a/indra/newview/llfloaterexploreanimations.h b/indra/newview/llfloaterexploreanimations.h
index bb3b91469..b0ec7f8e2 100644
--- a/indra/newview/llfloaterexploreanimations.h
+++ b/indra/newview/llfloaterexploreanimations.h
@@ -27,6 +27,16 @@ public:
 
 	void update();
 
+	void* operator new(size_t size)
+	{
+		return ll_aligned_malloc_16(size);
+	}
+
+	void operator delete(void* ptr)
+	{
+		ll_aligned_free_16(ptr);
+	}
+
 private:
 	virtual ~LLFloaterExploreAnimations();
 
diff --git a/indra/newview/llviewerjoint.h b/indra/newview/llviewerjoint.h
index fd262b6e8..1ec87ee41 100644
--- a/indra/newview/llviewerjoint.h
+++ b/indra/newview/llviewerjoint.h
@@ -49,6 +49,16 @@ public:
 	LLViewerJoint(const std::string &name, LLJoint *parent = NULL);
 	virtual ~LLViewerJoint();
 
+	void* operator new(size_t size)
+	{
+		return ll_aligned_malloc_16(size);
+	}
+
+	void operator delete(void* ptr)
+	{
+		ll_aligned_free_16(ptr);
+	}
+
 	// Render character hierarchy.
 	// Traverses the entire joint hierarchy, setting up
 	// transforms and calling the drawShape().
diff --git a/indra/newview/llviewerjointattachment.h b/indra/newview/llviewerjointattachment.h
index 9addafaee..bb94c3678 100644
--- a/indra/newview/llviewerjointattachment.h
+++ b/indra/newview/llviewerjointattachment.h
@@ -47,6 +47,16 @@ public:
 	LLViewerJointAttachment();
 	virtual ~LLViewerJointAttachment();
 
+	void* operator new(size_t size)
+	{
+		return ll_aligned_malloc_16(size);
+	}
+
+	void operator delete(void* ptr)
+	{
+		ll_aligned_free_16(ptr);
+	}
+
 	//virtual U32 render( F32 pixelArea );	// Returns triangle count
 
 	// Returns true if this object is transparent.
diff --git a/indra/newview/llviewerjointmesh.h b/indra/newview/llviewerjointmesh.h
index c5b872ede..017a7fe11 100644
--- a/indra/newview/llviewerjointmesh.h
+++ b/indra/newview/llviewerjointmesh.h
@@ -50,6 +50,16 @@ public:
 	// Destructor
 	virtual ~LLViewerJointMesh();
 
+	void* operator new(size_t size)
+	{
+		return ll_aligned_malloc_16(size);
+	}
+
+	void operator delete(void* ptr)
+	{
+		ll_aligned_free_16(ptr);
+	}
+
 	// Render time method to upload batches of joint matrices
 	void uploadJointMatrices();