From 313e008f61084d882c8b64c7c875ce656b47aeec Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Mon, 1 Aug 2011 23:33:56 +0200 Subject: [PATCH] Compile fixes to compile LL_DEBUG, and missing header (for linux?) --- indra/llcommon/llmemory.h | 1 + indra/newview/llspatialpartition.cpp | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/indra/llcommon/llmemory.h b/indra/llcommon/llmemory.h index 46176f4b0..35cee6653 100644 --- a/indra/llcommon/llmemory.h +++ b/indra/llcommon/llmemory.h @@ -35,6 +35,7 @@ #include #include +#include // uintptr_t #include "llerror.h" diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index abc281e0e..b3a3fb628 100644 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -119,7 +119,11 @@ void sg_assert(BOOL expr) void validate_drawable(LLDrawable* drawablep) { F64 rad = drawablep->getBinRadius(); - const LLVector3* ext = drawablep->getSpatialExtents(); + LLVector4a const* exta = drawablep->getSpatialExtents(); + + LLVector3 ext[2]; + ext[0].set(exta[0].getF32ptr()); + ext[1].set(exta[1].getF32ptr()); if (rad < 0 || rad > 4096 || (ext[1]-ext[0]).magVec() > 4096)