From e4a1b12e7a9c4bb8cbc2a1e41fddb8cec5a1b1e0 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 15 Dec 2011 12:48:07 -0500
Subject: SH-2789 WIP - build without tcmalloc, force alignment in various
 places

---
 indra/newview/llviewercamera.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 indra/newview/llviewercamera.h

(limited to 'indra/newview/llviewercamera.h')

diff --git a/indra/newview/llviewercamera.h b/indra/newview/llviewercamera.h
old mode 100644
new mode 100755
index cc3395115b..7257297cfd
--- a/indra/newview/llviewercamera.h
+++ b/indra/newview/llviewercamera.h
@@ -51,6 +51,7 @@ const BOOL NOT_FOR_SELECTION = FALSE;
 extern template class LLViewerCamera* LLSingleton<class LLViewerCamera>::getInstance();
 #endif
 
+LL_ALIGN_PREFIX(16)
 class LLViewerCamera : public LLCamera, public LLSingleton<LLViewerCamera>
 {
 public:
@@ -137,6 +138,7 @@ protected:
 	S16					mZoomSubregion;
 
 public:
-};
+} LL_ALIGN_POSTFIX(16);
+
 
 #endif // LL_LLVIEWERCAMERA_H
-- 
cgit v1.2.3


From 9c2e0d84f84fe7c38b1e9f7a127efc540b43f5aa Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Mon, 19 Dec 2011 18:17:18 -0500
Subject: SH-2789 WIP - various fixes to force 16-byte alignment

---
 indra/newview/llviewercamera.h | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'indra/newview/llviewercamera.h')

diff --git a/indra/newview/llviewercamera.h b/indra/newview/llviewercamera.h
index 7257297cfd..d2624ba14e 100755
--- a/indra/newview/llviewercamera.h
+++ b/indra/newview/llviewercamera.h
@@ -55,6 +55,15 @@ LL_ALIGN_PREFIX(16)
 class LLViewerCamera : public LLCamera, public LLSingleton<LLViewerCamera>
 {
 public:
+	void* operator new(size_t size)
+	{
+		return ll_aligned_malloc_16(size);
+	}
+
+	void operator delete(void* ptr)
+	{
+		ll_aligned_free_16(ptr);
+	}
 
 	typedef enum
 	{
-- 
cgit v1.2.3