diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-05-09 15:40:32 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-05-09 15:40:32 -0500 |
| commit | 50bbb0b7ed542a5f9dee4f347531537beecddd26 (patch) | |
| tree | 619d276c935c7db2ff3cecd6bb41808c82e6b479 /indra/newview/llspatialpartition.h | |
| parent | cd8e0b92e1c8f9f8544b1011e61c21c7789b93b7 (diff) | |
| parent | be9f71d16660e37fb058ddf05f20e6a80a272862 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
Diffstat (limited to 'indra/newview/llspatialpartition.h')
| -rw-r--r-- | indra/newview/llspatialpartition.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llspatialpartition.h b/indra/newview/llspatialpartition.h index 08e77855c4..e9be93ce98 100644 --- a/indra/newview/llspatialpartition.h +++ b/indra/newview/llspatialpartition.h @@ -70,12 +70,12 @@ protected: public: void* operator new(size_t size) { - return ll_aligned_malloc_16(size); + return ll_aligned_malloc(size,64); } void operator delete(void* ptr) { - ll_aligned_free_16(ptr); + ll_aligned_free(ptr); } @@ -121,6 +121,7 @@ public: U32 mDrawMode; U32 mBlendFuncSrc; U32 mBlendFuncDst; + BOOL mHasGlow; struct CompareTexture { |