diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-12-21 10:38:08 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-12-21 10:38:08 -0500 |
| commit | e0d77c277a46fa1161505a177e99b456854a98fd (patch) | |
| tree | 9c0bb28f90368e34fb907950ca54b94df85b5fa2 /indra/llmath/llvolume.cpp | |
| parent | c87142e5d779fb3d5375842658a63a1af2573094 (diff) | |
| parent | e7f3f3bdbbec310030209e09d389cd434adb7991 (diff) | |
Automated merge from mesh-development
Diffstat (limited to 'indra/llmath/llvolume.cpp')
| -rw-r--r-- | indra/llmath/llvolume.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index c0b50b606e..8a7b19800c 100644 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -29,7 +29,9 @@ #include "llmath.h" #include <set> +#if !LL_WINDOWS #include <stdint.h> +#endif #include "llerror.h" #include "llmemtype.h" |