summaryrefslogtreecommitdiff
path: root/indra/newview/llviewercamera.h
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-12-19 18:17:18 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-12-19 18:17:18 -0500
commit9c2e0d84f84fe7c38b1e9f7a127efc540b43f5aa (patch)
tree0daaa88c45802db177e722d1c1eaf36cd86871c5 /indra/newview/llviewercamera.h
parente62ad2bf13aa05cb19c2bd72e0d9f59117a6ec84 (diff)
SH-2789 WIP - various fixes to force 16-byte alignment
Diffstat (limited to 'indra/newview/llviewercamera.h')
-rwxr-xr-xindra/newview/llviewercamera.h9
1 files changed, 9 insertions, 0 deletions
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
{