diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-12-17 16:19:15 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-12-17 16:19:15 -0500 |
| commit | fa17e848a63c6eb2837ad064ae1f4d85e117b702 (patch) | |
| tree | b0f6f40f31d23bdbba4b18201fa7fcdd01ef6914 /indra/llmath/llvolume.cpp | |
| parent | ac7fad4cd0beeee670be40fae1956e5f22a0f17d (diff) | |
| parent | 089f9d6d370daed06c3b69d8567f65fc97300dc0 (diff) | |
Automated merge with https://hg.secondlife.com/mesh-development
Diffstat (limited to 'indra/llmath/llvolume.cpp')
| -rw-r--r-- | indra/llmath/llvolume.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index c20124076b..c0b50b606e 100644 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -29,6 +29,7 @@ #include "llmath.h" #include <set> +#include <stdint.h> #include "llerror.h" #include "llmemtype.h" @@ -90,10 +91,10 @@ const S32 SCULPT_MIN_AREA_DETAIL = 1; extern BOOL gDebugGL; -void assert_aligned(void* ptr, U32 alignment) +void assert_aligned(void* ptr, uintptr_t alignment) { #if 0 - U32 t = (U32) ptr; + uintptr_t t = (uintptr_t) ptr; if (t%alignment != 0) { llerrs << "WTF?" << llendl; |